openubmc-bingo 0.6.45__py3-none-any.whl → 0.6.99__py3-none-any.whl

bmcgo/__init__.py

@@ -9,4 +9,4 @@
 # MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
 # See the Mulan PSL v2 for more details.
 
-__version__ = '0.6.45'
+__version__ = '0.6.99'

bmcgo/bmcgo.py

@@ -10,13 +10,19 @@
 # MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
 # See the Mulan PSL v2 for more details.
 import sys
-
-from bmcgo.cli.cli import main
+import shutil
+import os
 
 
 def run():
+    from bmcgo import misc
+
+    shutil.rmtree(misc.CACHE_DIR, ignore_errors=True)
+    os.makedirs(misc.CACHE_DIR)
+    from bmcgo.cli.cli import main
+
     sys.exit(main(sys.argv[1:]))
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     run()

bmcgo/bmcgo_config.py

@@ -140,6 +140,7 @@ class BmcgoConfig(object):
 
     def _bmcgo_config_init(self):
         """配置初始化"""
+        self.bingo_version_range = None
         cwd = self.cwd
         if os.path.isfile("frame.py"):
             self.manifest = BmcgoManifest(os.path.realpath(os.path.join(cwd, "..")), None)
@@ -185,6 +186,9 @@ class BmcgoConfig(object):
                     self.component = BmcgoComp(folder, conf)
                 except (NoSectionError, NoOptionError):
                     log.debug("不是一个合法的组件仓，尝试查找mds/service.json")
+                
+                #检查是否需要升级
+                self._bingo_version_check(conf)
 
                 self._bmcgo_signature_config_load(conf)
 
@@ -194,6 +198,18 @@ class BmcgoConfig(object):
                 return
 
             cwd = os.path.dirname(cwd)
+    
+    def _bingo_version_check(self, conf: configparser.ConfigParser):
+        try:
+            version_range = conf.get("bingo", "version")
+        except Exception as e:
+            version_range = ""
+        version_range_str = version_range.strip("[").rstrip("]")
+        import semver
+        if semver.satisfies(__version__, version_range_str):
+            return
+        else:
+            self.bingo_version_range = version_range_str.replace(" ", ",")
 
     def _bmcgo_config_load(self):
         """读取配置"""

bmcgo/cli/cli.py

@@ -12,7 +12,6 @@
 import argparse
 import inspect
 import os
-import signal
 import sys
 import textwrap
 import importlib
@@ -39,6 +38,8 @@ from bmcgo.frame import Frame
 from bmcgo.bmcgo_config import BmcgoConfig
 from bmcgo.utils.tools import Tools
 from bmcgo.utils.config import Config
+from ..error_analyzer.unified_error_analyzer import UnifiedErrorAnalyzer
+
 
 cwd = os.getcwd()
 tools = Tools()
@@ -265,6 +266,12 @@ class Command(object):
             if command in ["-h", "--help"]:
                 self._show_help()
                 return 0
+            # 检查是否需要升级
+            if self.bconfig.bingo_version_range:
+                result_code = self.bingo_upgrade()
+                if result_code == 0:
+                    log.info("自动升级完成，请重新运行命令")
+                return result_code
             valid_command = self._find_real_command(command)
             # 命令参数
             command_args = args[0][1:]
@@ -315,7 +322,14 @@ class Command(object):
         studio_version = self._bmc_studio_version()
         if studio_version:
             log.info("bmc-studio 版本为: %s", studio_version)
-    
+
+    def bingo_upgrade(self):
+        version_range = self.bconfig.bingo_version_range.replace(",", " ")
+        log.info(f"检测到当前版本：{client_version}与约束版本{version_range}不匹配，将自动升级，完成后请重新运行")
+        from bmcgo.functional.upgrade import BmcgoCommand as upcommand
+        cmd = upcommand(self.bconfig, (["-v", f"bingo{self.bconfig.bingo_version_range}", "-f"]))
+        return cmd.run()
+
     def conan_init(self):
         if misc.conan_v2():
             tools.run_command("conan profile detect --force")
@@ -374,12 +388,6 @@ class Command(object):
                 if not match:
                     continue
                 import semver
-                # 临时兼容性措施，强制使用conan1构建
-                # 背景：开源组件初期未获取平台conan2.0支持，只能构建出conan1的包，但为了上库conan2.0的构建脚本
-                #      需要提供一个标记用于临时指示强制使用conan1构建
-                #      待平台版本正式上线后，删除1.60.0判断
-                if semver.satisfies("1.60.0", match[1]):
-                    break
                 if semver.satisfies("2.13.0", match[1]):
                     need_conan_v2 = True
                     break
@@ -457,14 +465,6 @@ class Command(object):
         """检查当前环境中正在使用的bmc studio版本，
         优先通过pip获取，获取不到通过bmc_studio/mds/server获取
         """
-        package_info = tools.run_command('pip3 show hw_ibmc_bmc_studio', sudo=True, 
-            command_echo=False, ignore_error=True, capture_output=True)
-        version = ""
-        if package_info:
-            version = package_info.stdout.replace("\n", " ")
-        match = re.match(r".*([0-9]+\.[0-9]+\.[0-9]+)", version)
-        if match:
-            return match.group(1)
         studio_path = tools.get_studio_path()
         bmc_studio_conf = os.path.join(f"{studio_path}/mds/service.json")
         if not os.path.isfile(bmc_studio_conf):
@@ -480,9 +480,9 @@ class Command(object):
     def _gen_command_group(self):
         self._command_group = []
         self._command_group.append((misc.GRP_INTE, self.inte_cmds))
-        self._command_group.append((misc.GRP_COMP, self.comp_cmds))
-        self._command_group.append((misc.GRP_CONAN_IDX, self.conan_idx_cmds))
         self._command_group.append((misc.GRP_IBMC_SDK, self.ibmc_sdk_cmds))
+        self._command_group.append((misc.GRP_CONAN_IDX, self.conan_idx_cmds))
+        self._command_group.append((misc.GRP_COMP, self.comp_cmds))
         self._command_group.append((misc.GRP_MISC, self.misc_cmds))
         self._command_group.append((misc.GRP_STUDIO, self.studio_cmds))
         return self._command_group
@@ -640,6 +640,12 @@ class Command(object):
         return False, None
 
 
+class ExtraCases:
+    def __init__(self, cases_file, cases_name):
+        self.cases_file = cases_file
+        self.cases_name = cases_name
+
+
 def prepare_conan():
     if misc.conan_v2():
         return
@@ -666,13 +672,11 @@ def prepare_conan():
         file_handler.write(yaml.safe_dump(config_data, indent=2, sort_keys=False))
 
 
-def run(args, command: Command = None):
+def run(args, command: Command = None, extra_cases: ExtraCases = None):
     """
     main entry point of the bmcgo application, using a Command to
     parse parameters
     """
-    os.makedirs(misc.CACHE_DIR, exist_ok=True)
-
     try:
         tools.run_command("whoami", show_log=True)
         prepare_conan()
@@ -688,8 +692,55 @@ def run(args, command: Command = None):
         msg = str(exc)
         log.error(msg)
         error = -1
+
+    if error == -1:
+        error_analyzer(extra_cases)
+
     return error
 
 
+def error_analyzer(extra_cases: ExtraCases):
+    base_cases_file = os.path.join(os.path.dirname(__file__), "..", "error_cases", "cases.yml")
+    base_cases = merge_local_remote_cases(base_cases_file, "bingo_cases")
+    if extra_cases:
+        extra_cases = merge_local_remote_cases(extra_cases.cases_file, extra_cases.cases_name)
+        base_cases.extend(extra_cases)
+    # 使用统一错误分析器
+    analyzer = UnifiedErrorAnalyzer(base_cases)
+    # 定义要分析的日志源（支持多种格式）
+    log_sources = [
+        misc.CACHE_DIR,         # 整个文件夹
+        os.path.join(cwd, "temp", "log"),  # 整个文件夹
+    ]
+    # 分析日志文件和命令失败信息
+    analyzer.analyze_errors(
+        log_sources=log_sources
+    )
+
+
+def merge_local_remote_cases(local_case_file, remote_case_name):
+    with open(local_case_file, "r") as local_case:
+        local_case_data = yaml.safe_load(local_case)
+        local_version = local_case_data.get("version")
+        local_cases = local_case_data.get("cases")
+        cases = local_cases
+    cmd = f"conan install --requires='{remote_case_name}/[>=1.0.0]@openubmc/stable' -u \
+        --deployer-folder=temp -of temp -d direct_deploy"
+    _ = tools.run_command(cmd, ignore_error=True)
+    remote_case_file = os.path.join(cwd, "temp", "direct_deploy", remote_case_name, "case.yml")
+    if os.path.exists(remote_case_file):
+        with open(remote_case_file, "r") as remote_case:
+            remote_case_data = yaml.safe_load(remote_case)
+            remote_version = remote_case_data.get("version")
+            remote_cases = remote_case_data.get("cases")
+            from packaging import version
+            remote_v = version.parse(remote_version)
+            local_v = version.parse(local_version)
+            if remote_v > local_v:
+                for k, v in remote_cases.items():
+                    cases[k] = v
+    return list(cases.values())
+
+
 def main(args):
     return run(args)

bmcgo/codegen/__init__.py

@@ -11,4 +11,4 @@
 
 # 非常重要，修改bmcgo后如果自动生成代码有变更的，必须变更__version__字段
 # 该版本号会传入mako渲染，在自动生成变更时需要做到向下兼容，确保代码自动生成功能OK
-__version__ = 18
+__version__ = 20

bmcgo/codegen/lua/codegen.py

@@ -134,7 +134,7 @@ class CodeGen(object):
         package = self.get_mdb_interface_package()
         cmd = ["conan", "install", f"--requires={package}", f"-of={temp_dir}", "--build=missing", "-d", "direct_deploy",
                f"--deployer-folder={temp_dir}"]
-        cmd += ["-pr=profile.dt.ini"]
+        cmd += ["-pr=profile.dt.ini", "-pr:b=profile.dt.ini"]
         if self.remote:
             cmd += ["-r", self.remote]
         subprocess.call(cmd)
@@ -153,7 +153,7 @@ class CodeGen(object):
         
         cmd = ["conan", "install", f"--requires={package}", f"-of={temp_dir}", "--build=missing", "-d", "direct_deploy",
                "--update", f"--deployer-folder={temp_dir}"]
-        cmd += ["-pr=profile.dt.ini"]
+        cmd += ["-pr=profile.dt.ini", "-pr:b=profile.dt.ini"]
         if self.remote:
             cmd += ["-r", self.remote]
 

bmcgo/codegen/lua/script/check_intfs.py

@@ -33,6 +33,7 @@ class IntfPool:
                     self.add_from_service(os.path.join(root, file))
                 if file == "model.json":
                     self.add_from_model(os.path.join(root, file))
+            self.pool["Properties"].add("bmc.kepler.Object.Properties")
 
         if project_name == 'hwproxy':
             for root, _, files in os.walk(os.path.join(mdb_path, "intf/mdb/bmc/dev")):

bmcgo/codegen/lua/script/dto/options.py

@@ -18,6 +18,7 @@ class Options:
         self.source_file_path: str = options.source_file_path
         self.template_name: str = options.template_name
         self.output_file_path: str = options.output_file_path
+        self.ignore_empty_input: bool = options.ignore_empty_input
         self.enable_auto_merge: bool = options.enable_auto_merge
         self.project_name = options.project_name
         self.version = options.version

bmcgo/codegen/lua/script/gen_db_json.py

@@ -380,7 +380,7 @@ def rectify_local_db(historical_local_db_file, out_dict):
         table_info["properties"] = new_props
 
 
-def save_json_file(is_local, load_dict, historical_local_db_file, of_name, disable_gen=False):
+def save_json_file(is_local, load_dict, historical_local_db_file, of_name, disable_gen):
     package = of_name.split("/")[-2]
     extra_imports = set()
     datas = make_datas(load_dict, package, extra_imports, is_local)
@@ -420,8 +420,9 @@ def generate(if_name, historical_local_db_file, of_name):
     load_dict = json.load(load_f)
     load_f.close()
     disable_mem_db_gen = Utils.get_lua_codegen_version() >= 7 and not Utils.check_model_need_mem_db(load_dict)
-    save_json_file(False, load_dict, historical_local_db_file, of_name, disable_gen=disable_mem_db_gen) # 保存普通持久化的表
-    save_json_file(True, load_dict, historical_local_db_file, of_name)  # 保存本地持久化的表
+    save_json_file(False, load_dict, historical_local_db_file, of_name, disable_mem_db_gen) # 保存普通持久化的表
+    disable_local_db_gen = Utils.get_lua_codegen_version() >= 19 and not Utils.check_model_need_local_db(load_dict)
+    save_json_file(True, load_dict, historical_local_db_file, of_name, disable_local_db_gen)  # 保存本地持久化的表
 
 
 def usage():

bmcgo/codegen/lua/script/gen_rpc_msg_json.py

@@ -16,6 +16,7 @@ import getopt
 import sys
 import os
 import stat
+from collections import defaultdict
 import mds_util as utils
 from utils import Utils
 
@@ -43,6 +44,15 @@ PROPERTY_FLAGS = {
 OPTIONS = 'options'
 
 
+def modify_common_interface_messages(messages):
+    intf_map = Utils.get_unique_intf_map()
+    for intf_name, require_path in Utils.get_common_interface_require_paths().items():
+        unique_intf_name = intf_map.get(intf_name)
+        if unique_intf_name and unique_intf_name in messages:
+            messages[unique_intf_name]['require_path'] = require_path
+            messages[unique_intf_name]['disable_gen'] = True
+
+
 def is_struct(prop_data):
     if 'baseType' not in prop_data:
         return True
@@ -166,8 +176,9 @@ def save_msg(intfs, out_dir, project_name):
             "package": pkg_name,
             "options": {},
             "filename": file_name,
-            "require_path": f"{project_name}.{require_dir}.{pkg_name}",
+            "require_path": pkg_data.get("require_path", f"{project_name}.{require_dir}.{pkg_name}"),
             "intf": pkg_data["data"] if "data" in pkg_data else {},
+            "disable_gen": pkg_data.get("disable_gen", False)
         }
         utils.save_proto_json(f"{new_out_dir}/{file_name}.json", datas)
 
@@ -219,7 +230,7 @@ def update_package(package, msg_name, struct_data, msg_package, imports):
 
 
 # 为结构体生成message
-def gen_defs(defs, msg_package, packages, imports=None):
+def gen_defs(defs, msg_package, packages, imports=None, package_filter=None):
     if imports is None:
         imports = {}
 
@@ -228,6 +239,8 @@ def gen_defs(defs, msg_package, packages, imports=None):
 
     package = packages[msg_package]
     for struct_name, struct_data in defs.items():
+        if package_filter and not package_filter.get("defs", {}).get(struct_name, True):
+            continue
         msg_name = struct_name
         if not check_duplicate_msg(package["messages"], msg_name):
             update_package(package, msg_name, struct_data, msg_package, imports)
@@ -265,7 +278,7 @@ def convert_property_options(intf, property_name: str, options_data: dict):
     return flags
 
 
-def generate_message(intf_data, intf, packages, imports):
+def generate_message(intf_data, intf, packages, imports, package_filter=None):
     msg_package = Utils.get_unique_intf_name(intf)
 
     if msg_package not in packages:
@@ -273,7 +286,7 @@ def generate_message(intf_data, intf, packages, imports):
     package = packages[msg_package]
     package["data"] = {"name": intf, "data": intf_data}
 
-    if "methods" in intf_data:
+    if "methods" in intf_data and (not package_filter or package_filter.get("methods")):
         for method_name, method_data in intf_data["methods"].items():
             req_name = method_name + "Req"
             rsp_name = method_name + "Rsp"
@@ -285,14 +298,14 @@ def generate_message(intf_data, intf, packages, imports):
                 update_package(package, rsp_name, get_rsp(
                     method_data), msg_package, imports)
 
-    if "signals" in intf_data:
+    if "signals" in intf_data and (not package_filter or package_filter.get("signals")):
         for signal_name, signal_data in intf_data["signals"].items():
             signature_name = signal_name + "Signature"
             if not check_duplicate_msg(package["messages"], signature_name):
                 update_package(package, signature_name,
                                signal_data, msg_package, imports)
 
-    if "properties" in intf_data:
+    if "properties" in intf_data and (not package_filter or package_filter.get("properties")):
         for property_name, property_data in intf_data["properties"].items():
             if not check_duplicate_msg(package["messages"], property_name):
                 update_package(package, property_name,
@@ -365,6 +378,7 @@ def gen_service_msg(model_merged_file, of_name, mdb_path, project_name):
     messages = {}
     imports = {}
     get_service_messages(mdb_path, load_dict, messages, imports)
+    modify_common_interface_messages(messages)
     save_msg(messages, of_name, project_name)
     load_f.close()
 
@@ -387,15 +401,57 @@ def gen_model_msg(model_merged_file, of_name):
     load_f.close()
 
 
-def gen_client_msg_intf(intf_json, intf, messages):
+def gen_client_msg_intf(intf_json, intf, messages, package_filter=None):
     imports = {}
     for intf_name, intf_data in intf_json.items():
         if intf_name == "defs":
-            gen_defs(intf_data, Utils.get_unique_intf_name(intf), messages)
+            gen_defs(intf_data, Utils.get_unique_intf_name(intf), messages, None, package_filter)
         else:
             prepare_intf_data(intf_json, intf_name)
             prepare_virutal(intf_data)
-            generate_message(intf_data, intf_name, messages, imports)
+            generate_message(intf_data, intf_name, messages, imports, package_filter)
+
+
+def parse_ref_items(input_data, refs):
+    for key, value in input_data.items():
+        if key != "$ref":
+            if isinstance(value, dict):
+                parse_ref_items(value, refs)
+            continue
+        if isinstance(value, str) and value.startswith("#/defs/"):
+            refs[value.replace("#/defs/", "")] = input_data.get("baseType") == "Enum"
+
+
+def set_def_enbale_gen(input_data, defs_enable_gen, enabled):
+    refs = dict()
+    parse_ref_items(input_data, refs)
+    for ref, is_enum in refs.items():
+        if ref in defs_enable_gen:
+            defs_enable_gen[ref] = enabled or is_enum
+
+
+def parse_interface_defs(intf_json, package_filter):
+    defs_data = intf_json.get("defs", {})
+    if not defs_data:
+        return {}
+    defs_enable_gen = {def_name: False for def_name in defs_data.keys()}
+    for intf_name, intf_data in intf_json.items():
+        if intf_name == "defs":
+            continue
+        for category, enable_gen in package_filter.items():
+            for item_data in intf_data.get(category, {}).values():
+                # 属性、方法、信号如果需要生成校验器，它们引用的自定义类型也需要生成校验器
+                # 枚举类型可能被用于属性默认值，也需要生成
+                set_def_enbale_gen(item_data, defs_enable_gen, enable_gen)
+
+    for def_name, def_data in defs_data.items():
+        if defs_enable_gen.get(def_name):
+            # 自定义类型如果需要生成校验器，它们引用的其它自定义类型也需要生成校验器
+            set_def_enbale_gen(def_data, defs_enable_gen, True)
+        # 没有被资源协作接口引用的枚举类型，不应该生成代码。但部分组件存在使用json_types文件的枚举定义，这里先做兼容处理
+        if utils.get_message_type(def_data) == 'enum':
+            defs_enable_gen[def_name] = True
+    return defs_enable_gen
 
 
 def gen_client_msg(service_file, output, mdb_path, project_name):
@@ -412,8 +468,19 @@ def gen_client_msg(service_file, output, mdb_path, project_name):
         intf_json = utils.get_intf(intf, mdb_path)
         if "implement" in intf_json[intf]:
             intf_json = utils.generate_default(intf_json, mdb_path)
-        gen_client_msg_intf(intf_json, intf, messages)
-
+        package_filter = None
+        if Utils.get_lua_codegen_version() >= 19:
+            # 客户端用到的接口，不需要生成属性校验器、信号参数校验器，只需要生成方法参数校验器
+            # package_filter里面True表示需要生成，False表示不需要生成
+            package_filter = {
+                "properties": False,
+                "methods": True,
+                "signals": False
+            }
+            package_filter["defs"] = parse_interface_defs(intf_json, package_filter)
+        gen_client_msg_intf(intf_json, intf, messages, package_filter)
+
+    modify_common_interface_messages(messages)
     save_msg(messages, output, project_name)
     load_f.close()
 

bmcgo/codegen/lua/script/model_consistency_check.py

@@ -154,10 +154,10 @@ def check_intf_consistency(mdb_intf, complete_intf, class_name, intf_name):
 
 def check_model_consistency(class_name, complete_model, mdb_obj, mdb_path):
     intf_complete = set(complete_model["interfaces"].keys())
+    intf_complete.discard(OBJECT_PROPERTIES_INTERFACE)
     intf_mdb = set(mdb_obj[class_name]["interfaces"])
     if intf_complete != intf_mdb:
         intf_only_in_mds = intf_complete - intf_mdb
-        intf_only_in_mds.discard(OBJECT_PROPERTIES_INTERFACE)
         if intf_only_in_mds:
             raise RuntimeError(f"组件模型中类{class_name}的接口{intf_only_in_mds}未在mdb_interface中定义"
                 f"，请检查model.json与mdb_interface定义"

bmcgo/codegen/lua/script/render_utils/db_lua.py

@@ -206,12 +206,11 @@ class DbLuaUtils(Base, Utils):
                 return result + "}"
             value_name = Utils(self.data, self.options).enum_value_name(types["name"], d_val)
             return f'{types["package"]}.{types["name"]}.{value_name}'
-        if Utils.get_lua_codegen_version() >= 10:
-            if prop.get('repeated') and not isinstance(d_val, list):
-                raise RuntimeError(f"model.json中类{class_name}的属性{prop['name']}默认值{d_val}类型与属性类型不一致")
-            if isinstance(d_val, list) or isinstance(d_val, dict):
-                json_str = json.dumps(d_val).replace("'", "''")
-                return f"[['{json_str}']]"
+        if prop.get('repeated') and not isinstance(d_val, list):
+            raise RuntimeError(f"model.json中类{class_name}的属性{prop['name']}默认值{d_val}类型与属性类型不一致")
+        if isinstance(d_val, list) or isinstance(d_val, dict):
+            json_str = json.dumps(d_val).replace("'", "''")
+            return f"[['{json_str}']]"
         if type_name == "string" or type_name == 'bytes':
             return f'"\'{d_val}\'"'
         if type_name == "bool":

bmcgo/codegen/lua/script/render_utils/model_lua.py

@@ -215,6 +215,9 @@ class ModelLuaUtils(Base, Utils):
     def get_mdb_prop_configs(self, msg):
         string = '{'
         for (interface, intf_msg) in msg['interfaces'].items():
+            if Utils.get_lua_codegen_version() == 19 and interface == 'bmc.kepler.Object.Properties':
+                string += f"['{interface}'] = mdb.OBJECT_PROPERTIES_INTERFACE_PROP_CONFIGS,"
+                continue
             if not self.has_properties(intf_msg):
                 continue
             intf_name = self.get_intf_name(interface, intf_msg)
@@ -455,7 +458,8 @@ class ModelLuaUtils(Base, Utils):
             for (interface, intf_msg) in msg.get('interfaces', {}).items():
                 intf_name = self.get_intf_name(interface, intf_msg)
                 intf_type = self.get_intf_type(intf_name)
-                types[intf_type] = f"local {intf_type} = require '{project_name}.json_types.{intf_name}'\n"
+                path = Utils.get_interface_require_path(interface, project_name, intf_name)
+                types[intf_type] = f"local {intf_type} = require '{path}'\n"
         return types
 
     def render_types(self, project_name, root):

bmcgo/codegen/lua/script/template.py

@@ -52,6 +52,9 @@ def parse_input_args() -> Options:
     parser.add_argument("-v", "--version", dest="version",
                         help="version",
                         default=-1)
+    parser.add_argument("--ignore_empty_input", dest="ignore_empty_input",
+                        help="Whether to stop generating result file when input is empty",
+                        action=misc.STORE_TRUE, default=False)
     parser.add_argument("--enable_auto_merge", dest="enable_auto_merge",
                         help="Whether result files are automatically combined when customized.",
                         action=misc.STORE_TRUE, default=False)
@@ -130,6 +133,8 @@ def generate(options: Options):
     if os.path.exists(options.output_file_path):
         os.remove(options.output_file_path)
     load_imports(data, options)
+    if not data and options.ignore_empty_input and utils.Utils.get_lua_codegen_version() >= 19:
+        return
     os.makedirs(os.path.dirname(options.output_file_path), exist_ok=True)
     output_file = os.fdopen(os.open(options.output_file_path,
                             os.O_WRONLY | os.O_CREAT | os.O_TRUNC, stat.S_IWUSR | stat.S_IRUSR), 'w')

bmcgo/codegen/lua/script/utils.py

@@ -86,7 +86,26 @@ class Utils:
         'general_hardware',
         'lsw',
         'manufacture',
-        'account'
+        'account',
+        'spdm'
+    }
+
+    COMMON_INTERFACE_REQUIRE_PATHS = {
+        'bmc.kepler.MicroComponent': 'mdb.bmc.kepler.MicroComponentInterface',
+        'bmc.kepler.MicroComponent.ConfigManage': 'mdb.bmc.kepler.MicroComponent.ConfigManageInterface',
+        'bmc.kepler.MicroComponent.Debug': 'mdb.bmc.kepler.MicroComponent.DebugInterface',
+        'bmc.kepler.MicroComponent.Performance': 'mdb.bmc.kepler.MicroComponent.PerformanceInterface',
+        'bmc.kepler.MicroComponent.Reboot': 'mdb.bmc.kepler.MicroComponent.RebootInterface',
+        'bmc.kepler.MicroComponent.Reset': 'mdb.bmc.kepler.MicroComponent.ResetInterface',
+        'bmc.kepler.Object.Properties': 'mdb.bmc.kepler.Object.PropertiesInterface',
+        'bmc.kepler.Release.Maintenance': 'mdb.bmc.kepler.Release.MaintenanceInterface',
+        'bmc.kepler.TaskService.Task': 'mdb.bmc.kepler.TaskService.TaskInterface'
+    }
+
+    # 不依赖新版本lua框架的公共接口
+    COMMON_INTERFACE_REQUIRE_PATHS_LIMITED = {
+        'bmc.kepler.Object.Properties': 'mdb.bmc.kepler.Object.PropertiesInterface',
+        'bmc.kepler.TaskService.Task': 'mdb.bmc.kepler.TaskService.TaskInterface'
     }
 
     def __init__(self, data: dict, options: Options):
@@ -253,7 +272,7 @@ class Utils:
 {6}'''
         project_name = os.getenv('PROJECT_NAME')
         if Utils.get_lua_codegen_version() >= 8 and project_name in Utils.OPEN_PROJECTS:
-            header = '''{5}Copyright (c) 2024 Huawei Technologies Co., Ltd.
+            header = '''{5}Copyright (c) {0} Huawei Technologies Co., Ltd.
 {4}openUBMC is licensed under Mulan PSL v2.
 {4}You can use this software according to the terms and conditions of the Mulan PSL v2.
 {4}You may obtain a copy of Mulan PSL v2 at:
@@ -281,7 +300,14 @@ class Utils:
             if "tableName" in class_data and class_data.get("tableLocation") != "Local":
                 return True
         return False
-    
+
+    @staticmethod
+    def check_model_need_local_db(model_json: dict):
+        for class_data in model_json.values():
+            if "tableName" in class_data and class_data.get("tableLocation") == "Local":
+                return True
+        return False
+
     @staticmethod
     def has_db(root: dict):
         return Utils.check_need_mem_db(root) or Utils.check_local_poweroff_db(root) or \
@@ -348,15 +374,31 @@ class Utils:
         return Utils.get_unique_intf_name(full_intf_name) + "." + slices[-1]
 
     @staticmethod
-    def get_unique_intf_name(intf):
-        check_intfs = Path(__file__).parent.parent.joinpath("temp").joinpath("check_intfs.json")
+    def get_unique_intf_map():
+        check_intfs = Path(__file__).parent.parent.joinpath('temp').joinpath('check_intfs.json')
         with open(check_intfs, 'r') as check_intfs_fp:
-            intf_map = json.load(check_intfs_fp)
+            return json.load(check_intfs_fp)
 
+    @staticmethod
+    def get_unique_intf_name(intf):
         slices = intf.split('.')
-        if slices[-1] == "Default":
+        if slices[-1] == 'Default':
             return slices[-2] + slices[-1]
-        return intf_map.get(intf, slices[-1])
+        return Utils.get_unique_intf_map().get(intf, slices[-1])
+
+    @staticmethod
+    def get_common_interface_require_paths():
+        gen_version = Utils.get_lua_codegen_version()
+        if gen_version < 19:
+            return {}
+        if gen_version == 19:
+            return Utils.COMMON_INTERFACE_REQUIRE_PATHS
+        return Utils.COMMON_INTERFACE_REQUIRE_PATHS_LIMITED
+
+    @staticmethod
+    def get_interface_require_path(intf_name, project_name, unique_intf_name):
+        fallback = f'{project_name}.json_types.{unique_intf_name}'
+        return Utils.get_common_interface_require_paths().get(intf_name, fallback)
 
     @staticmethod
     def get_files(path):

bmcgo/codegen/lua/templates/apps/Makefile

@@ -80,7 +80,7 @@ message: $(foreach v, $(MESSAGE_FILES), $(GEN_OUT_DIR)/$(v).lua)
 define MAKE_DATAS
   $$(GEN_OUT_DIR)/$(1).lua: ${PROTO_OUT_DIR}/$(1).json $${TEMPLATE_BIN} datas.lua.mako
 	@mkdir -p $$(dir $$@)
-	python3 $${TEMPLATE_BIN} -d ${PROTO_DIR} -j ${PROTO_OUT_DIR} -n ${PROJECT_NAME} -i ${PROTO_OUT_DIR}/$(1).json -f ${LUA_FORMATER} -t datas.lua.mako -o $$@
+	python3 $${TEMPLATE_BIN} -d ${PROTO_DIR} -j ${PROTO_OUT_DIR} -n ${PROJECT_NAME} -i ${PROTO_OUT_DIR}/$(1).json -f ${LUA_FORMATER} -t datas.lua.mako --ignore_empty_input -o $$@
 endef
 $(foreach v, $(YAML_FILES), $(eval $(call MAKE_DATAS,$(v))))
 datas: $(foreach v, $(YAML_FILES), $(GEN_OUT_DIR)/$(v).lua)
@@ -89,7 +89,7 @@ define MAKE_CONF_DATAS
   $$(GEN_OUT_DIR)/$(1).lua: ${CONF_DIR}/$(1).yaml $${TEMPLATE_BIN} datas.lua.mako
 	@mkdir -p $$(dir $$@)
 	python3 ${YAML_TO_JSON_BIN} -i ${CONF_DIR}/$(1).yaml -b ${CONF_DIR} -o ${PROTO_OUT_DIR}/$(1).json
-	python3 $${TEMPLATE_BIN} -d ${CONF_DIR} -j ${PROTO_OUT_DIR} -n ${PROJECT_NAME} -i ${PROTO_OUT_DIR}/$(1).json -f ${LUA_FORMATER} -t datas.lua.mako -o $$@
+	python3 $${TEMPLATE_BIN} -d ${CONF_DIR} -j ${PROTO_OUT_DIR} -n ${PROJECT_NAME} -i ${PROTO_OUT_DIR}/$(1).json -f ${LUA_FORMATER} -t datas.lua.mako --ignore_empty_input -o $$@
 endef
 $(foreach v, $(YAML_FILES_CONF), $(eval $(call MAKE_CONF_DATAS,$(v))))
 datas_conf: $(foreach v, $(YAML_FILES_CONF), $(GEN_OUT_DIR)/$(v).lua)