lbkit 0.9.10__tar.gz → 0.9.12__tar.gz

{lbkit-0.9.10 → lbkit-0.9.12}/MANIFEST.in

@@ -1,3 +1,4 @@
 recursive-include lbkit/codegen/template *.mako
+include lbkit/codegen/.clang-format
 recursive-include lbkit/tasks/template *.mako
 recursive-include lbkit/component/template *.mako

{lbkit-0.9.10/lbkit.egg-info → lbkit-0.9.12}/PKG-INFO

@@ -1,15 +1,14 @@
 Metadata-Version: 2.4
 Name: lbkit
-Version: 0.9.10
+Version: 0.9.12
 Summary: Tools provided by litebmc.com
 Home-page: https://www.litebmc.com
 Author: xuhj@litebmc.com
 Author-email: xuhj@litebmc.com
 Classifier: Programming Language :: Python :: 3
-Classifier: License :: OSI Approved :: MIT License
+Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
 Classifier: Operating System :: OS Independent
 Description-Content-Type: text/markdown
-License-File: LICENSE
 License-File: AUTHORS
 Requires-Dist: pyyaml
 Requires-Dist: colorama

lbkit-0.9.12/lbkit/__commit__.py

@@ -0,0 +1 @@
+__commit__ = 'e5ea324'

lbkit-0.9.12/lbkit/__init__.py

@@ -0,0 +1,2 @@
+
+__version__ = '0.9.12'

{lbkit-0.9.10 → lbkit-0.9.12}/lbkit/build_conan_parallel.py

@@ -1,3 +1,9 @@
+# Copyright (c) 2021-2024 litebmc.com
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation; either version 3 of the License, or (at your
+# option) any later version.
 """任务基础类"""
 import os
 import json

{lbkit-0.9.10 → lbkit-0.9.12}/lbkit/cli.py

@@ -1,3 +1,9 @@
+# Copyright (c) 2021-2024 litebmc.com
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation; either version 3 of the License, or (at your
+# option) any later version.
 """lbkit命令行入口"""
 import inspect
 import os
@@ -6,6 +12,10 @@ import sys
 import argparse
 import traceback
 from lbkit import __version__ as client_version
+try:
+    from lbkit.__commit__ import __commit__ as client_commit
+except ImportError:
+    client_commit = ""
 from lbkit.codegen.codegen import CodeGen
 from lbkit.component.build import BuildComponent
 from lbkit.component.test import TestComponent
@@ -16,6 +26,7 @@ from lbkit import misc
 from lbkit import errors
 from lbkit.ukr.build import UKRBuild
 from lbkit.utils.env_detector import EnvDetector
+from lbkit.skill.manager import sync as skill_sync
 
 log = Logger()
 
@@ -60,15 +71,6 @@ class Command(object):
         gen = CodeGen(argv)
         gen.run()
 
-    # new package
-    def new(self, *args):
-        """
-        按LiteBmc最佳实践创建一个新的组件.
-
-        你需要指定你需要使用的编程语言，当前仅支持C(基于litebmc框架)和C++(基于openbmc的sdbusplus)
-        """
-        log.info("new package")
-
     # build package
     def build(self, *args):
         """
@@ -105,13 +107,22 @@ class Command(object):
         build = TestComponent(argv)
         build.run()
 
+    def skill(self, *args):
+        """
+        同步AI技能包.
+
+        从技能仓库下载并复制所有skills到用户全局技能库(~/.claude/skills)
+        """
+        skill_sync()
+
     def _show_help(self):
         """
         Prints a summary of all commands.
         """
         grps = [("Code Generate commands", ["gen"]),
-                ("Build Component commands", ["new", "build", "test"]),
+                ("Build Component commands", ["build", "test"]),
                 ("Build Product commands", ["build"]),
+                ("AI Skill commands", ["skill"]),
                 ("Misc commands", ["help"]),
                ]
 
@@ -194,7 +205,10 @@ class Command(object):
                 method = commands[command]
             except KeyError as exc:
                 if command in ["-v", "--version"]:
-                    log.info("LiteBmc version %s" % client_version)
+                    ver = f"LiteBmc version {client_version}"
+                    if client_commit:
+                        ver += f" (commit {client_commit})"
+                    log.info(ver)
                     return False
 
                 self._warn_python_version()
@@ -215,17 +229,17 @@ class Command(object):
             if exc.code != 0:
                 log.error("Exiting with code: %d" % exc.code)
             ret_code = exc.code
-        except (errors.LiteBmcException, errors.RunCommandException, errors.ArgException, errors.PackageConfigException, Exception, errors.OdfValidateException) as exc:
+        except errors.TestException as exc:
+            log.error("lbk exit with exception:")
+            log.error(exc)
+            ret_code = -1
+        except Exception as exc:
             log.error("lbk exit with exception:")
             if os.environ.get("LOG"):
                 print(traceback.format_exc())
             ret_code = -1
             msg = str(exc)
             log.error(msg)
-        except errors.TestException:
-            log.error("lbk exit with exception:")
-            log.error(exc)
-            ret_code = -1
 
         return ret_code
 

lbkit-0.9.12/lbkit/codegen/.clang-format

@@ -0,0 +1,70 @@
+---
+# LiteBMC 代码生成默认格式化配置
+# 参考 Linux 内核风格, 适配 GLib/C 项目
+# BasedOnStyle: LLVM
+
+AccessModifierOffset: -4
+AlignAfterOpenBracket: Align
+AlignConsecutiveAssignments: false
+AlignConsecutiveDeclarations: false
+AlignEscapedNewlines: Left
+AlignOperands: true
+AlignTrailingComments: false
+AllowAllParametersOfDeclarationOnNextLine: false
+AllowShortBlocksOnASingleLine: false
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: None
+AllowShortIfStatementsOnASingleLine: false
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakAfterDefinitionReturnType: None
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: false
+BinPackArguments: true
+BinPackParameters: true
+BraceWrapping:
+  AfterControlStatement: false
+  AfterEnum: false
+  AfterFunction: true
+  AfterStruct: false
+  BeforeCatch: false
+  BeforeElse: false
+  IndentBraces: false
+BreakBeforeBinaryOperators: None
+BreakBeforeBraces: Custom
+BreakBeforeTernaryOperators: false
+BreakStringLiterals: false
+ColumnLimit: 120
+CommentPragmas: '^ IWYU pragma:'
+ConstructorInitializerIndentWidth: 4
+ContinuationIndentWidth: 4
+Cpp11BracedListStyle: false
+DerivePointerAlignment: false
+FixNamespaceComments: false
+IndentCaseLabels: false
+IndentGotoLabels: false
+IndentPPDirectives: None
+IndentWidth: 4
+IndentWrappedFunctionNames: false
+KeepEmptyLinesAtTheStartOfBlocks: false
+MaxEmptyLinesToKeep: 1
+PointerAlignment: Right
+ReflowComments: false
+SortIncludes: false
+SpaceAfterCStyleCast: false
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeParens: ControlStatementsExceptForEachMacros
+SpacesBeforeTrailingComments: 1
+SpacesInAngles: false
+SpacesInContainerLiterals: false
+SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+TabWidth: 4
+UseTab: Never
+PenaltyBreakAssignment: 10
+PenaltyBreakBeforeFirstCallParameter: 30
+PenaltyBreakComment: 10
+PenaltyBreakFirstLessLess: 0
+PenaltyBreakString: 10
+PenaltyExcessCharacter: 100
+PenaltyReturnTypeOnItsOwnLine: 60

{lbkit-0.9.10 → lbkit-0.9.12}/lbkit/codegen/codegen.py

@@ -1,3 +1,9 @@
+# Copyright (c) 2021-2024 litebmc.com
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation; either version 3 of the License, or (at your
+# option) any later version.
 """
     DBus接口代码自动生成
 """
@@ -7,6 +13,8 @@ import re
 import json
 import yaml
 import argparse
+import shutil
+import subprocess
 from concurrent.futures import ProcessPoolExecutor, as_completed
 from lbkit.codegen.idf_interface import IdfInterface
 
@@ -62,45 +70,93 @@ class Version():
             return True
         return False
 
-# 历史自动生成版本号，计划用于用于生成代码稳定性测试
-# TODO： 支持生成代码稳定性测试，确保生成的代码一致性
+# 历史自动生成版本号，用于管理代码生成版本与lb_base的兼容性
+# 新增兼容性变更时添加条目，格式："版本号": CodeGenHistory("lb_base依赖范围", "变更描述", "compatible_required值")
 history_versions = {
-    "5.3": CodeGenHistory("lb_base/[>=0.8.5 <0.9.0]", "支持32位操作系统", "8004"),
     "5.4": CodeGenHistory("lb_base/[>=0.9.0 <0.10.0]", "LBInterface增加alias", "9000"),
 }
+
+# 最新的版本号
 __version__=Version("5.4")
 
 
 def version_check(ver_str: str):
     if not re.match("^([0-9]|([1-9][0-9]*))\\.([0-9]|([1-9][0-9]*))$", ver_str):
         raise Exception(f"Version string {ver_str} not match with regex ^([0-9]|([1-9][0-9]*))\\.([0-9]|([1-9][0-9]*))$")
-    if "x" not in ver_str:
+    if history_versions.get(ver_str):
+        return ver_str
+    if not history_versions:
         return ver_str
-    if not history_versions.get(ver_str):
-        log.error(f"Unkonw codegen version {ver_str}, supported versions:")
-        for ver, msg in history_versions.items():
-            log.error(f"    {ver}: {msg}")
-        raise Exception(f"Can't found the valid version for {ver_str}")
-
-def codegen_version_max():
-    max_v = __version__
-    for ver_str, _ in history_versions.items():
-        next_ver = Version(ver_str)
-        if next_ver.bt(max_v.str):
-            max_v = next_ver
-    return max_v.str
+    log.error(f"Unkonw codegen version {ver_str}, supported versions:")
+    for ver, msg in history_versions.items():
+        log.error(f"    {ver}: {msg}")
+    raise Exception(f"Can't found the valid version for {ver_str}")
 
 def codegen_version_arg(parser: argparse.ArgumentParser, default=__version__.str, short_arg="-cv", full_arg="--codegen_version"):
-    # 默认的自动生成工具版本号为2
-    help=f'''must less than or equal to {codegen_version_max()}, default: {default}
-
-        codegen versions:
-        '''
+    help=f'''default: {default}'''
     for ver, detail in history_versions.items():
-        help += f"- {ver}: compatible with {detail.lb_base}, {detail.description}\n"
+        help += f"\n    - {ver}: compatible with {detail.lb_base}, {detail.description}"
     parser.add_argument(short_arg, full_arg, help=help, type=str, default=__version__.str)
 
 
+def _find_clang_format_config(idf_file):
+    """查找 .clang-format 配置文件，优先级：IDF目录 > 组件目录 > toolkit默认"""
+    # 优先级1：IDF文件所在目录（接口仓库级配置）
+    idf_dir = os.path.dirname(os.path.realpath(idf_file))
+    candidate = os.path.join(idf_dir, ".clang-format")
+    if os.path.isfile(candidate):
+        return candidate
+    # 优先级2：组件源码目录（组件仓库级配置）
+    candidate = os.path.join(os.getcwd(), ".clang-format")
+    if os.path.isfile(candidate):
+        return candidate
+    # 优先级3：toolkit自带的默认配置
+    candidate = os.path.join(lb_cwd, ".clang-format")
+    if os.path.isfile(candidate):
+        return candidate
+    return None
+
+
+def _format_generated_files(idf_file, directory, interface_alias):
+    """使用 clang-format 格式化生成的 .c 和 .h 文件"""
+    clang_format_bin = shutil.which("clang-format")
+    if not clang_format_bin:
+        log.warn("clang-format not found, skipping auto-formatting of generated files")
+        return
+
+    style_file = _find_clang_format_config(idf_file)
+    if not style_file:
+        log.warn("No .clang-format config found, skipping auto-formatting")
+        return
+
+    files_to_format = []
+    for ct in ["server", "client", "public"]:
+        ct_dir = os.path.join(directory, ct)
+        if not os.path.isdir(ct_dir):
+            continue
+        for ext in [".c", ".h"]:
+            fpath = os.path.join(ct_dir, interface_alias + ext)
+            if os.path.isfile(fpath):
+                files_to_format.append(fpath)
+
+    if not files_to_format:
+        return
+
+    log.debug(f"Formatting {len(files_to_format)} generated files with clang-format (style: {style_file})")
+    for fpath in files_to_format:
+        try:
+            subprocess.run(
+                [clang_format_bin, f"--style=file:{style_file}", "-i", fpath],
+                check=True, capture_output=True, timeout=30
+            )
+        except subprocess.TimeoutExpired:
+            log.warn(f"clang-format timed out on {fpath}, skipping")
+        except subprocess.CalledProcessError as e:
+            log.warn(f"clang-format failed on {fpath}: {e.stderr.strip() if e.stderr else 'unknown error'}")
+        except Exception as e:
+            log.warn(f"clang-format error on {fpath}: {str(e)}")
+
+
 def _gen_interface(idf_file, directory=".", code_type="all", codegen_version_str="5.4", log_level="NOTSET"):
     """模块级函数，供多进程调用"""
     directory = os.path.realpath(directory)
@@ -137,6 +193,8 @@ def _gen_interface(idf_file, directory=".", code_type="all", codegen_version_str
     with open(json_file, "w", encoding="utf-8") as fp:
         yaml.dump(data, fp, encoding='utf-8', allow_unicode=True)
 
+    _format_generated_files(idf_file, directory, interface.alias)
+
 
 class CodeGen(object):
     def __init__(self, args):
@@ -215,7 +273,7 @@ class CodeGen(object):
             raise ArgException(f"argument error, arguments -c/--cdf_file and -i/--idf_file are not set")
         if not os.path.isfile(intf_file):
             raise ArgException(f"argument -i/--idf_file: {args.idf_file} not exist")
-        if self.codegen_version.bt(codegen_version_max()):
+        if self.codegen_version.bt(__version__.str):
             raise ArgException(f"argument -cv/--codegen_version: validate failed, must less than or equal to {__version__.str}")
         out_dir = os.path.join(os.getcwd(), args.directory)
         if not intf_file.endswith(".yaml"):

{lbkit-0.9.10 → lbkit-0.9.12}/lbkit/codegen/ctype_defination.py

@@ -1,3 +1,9 @@
+# Copyright (c) 2021-2024 litebmc.com
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation; either version 3 of the License, or (at your
+# option) any later version.
 """语言相关类型定义"""
 import sys
 from lbkit.errors import OdfValidateException

{lbkit-0.9.10 → lbkit-0.9.12}/lbkit/codegen/idf_interface.py

@@ -1,3 +1,9 @@
+# Copyright (c) 2021-2024 litebmc.com
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation; either version 3 of the License, or (at your
+# option) any later version.
 import os
 import re
 import copy

lbkit-0.9.12/lbkit/codegen/renderer.py

@@ -0,0 +1,15 @@
+# Copyright (c) 2021-2024 litebmc.com
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation; either version 3 of the License, or (at your
+# option) any later version.
+from mako.lookup import TemplateLookup
+
+class Renderer(object):
+    def __init__(self):
+        super(Renderer, self).__init__()
+
+    def render(self, lookup: TemplateLookup, template, **kwargs):
+        t = lookup.get_template(template)
+        return t.render(lookup=lookup, **kwargs)

{lbkit-0.9.10 → lbkit-0.9.12}/lbkit/codegen/template/client.c.mako

@@ -1,6 +1,21 @@
 <%
 from inflection import underscore
 %>\
+/*
+ * Copyright (c) 2021-2024 litebmc.com
+ * Auto-generated by lbkit, DO NOT EDIT.
+ *
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation; either version 2.1 of the License, or (at your
+ * option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+ * for more details.
+ **/
+
 #include "lb_base.h"
 #include "${intf.alias}.h"
 
@@ -31,46 +46,6 @@ gint ${class_name}_set_${prop.name}(${class_name} obj,
     return lb_impl.write_property((LBO *)obj, &${properties}.${prop.name}, tmp, error);
 }
 
-% endif
-## 私有或只写属性不允许读
-% if not prop.private and prop.access != "write":
-    % if prop.deprecated:
-__deprecated gint ${class_name}_get_${prop.name}(${class_name} obj,
-    ${", ".join(prop.out_declare()).replace("<arg_name>", "value").replace("<const>", "")}, GError **error)
-    % else:
-gint ${class_name}_get_${prop.name}(${class_name} obj, ${", ".join(prop.out_declare()).replace("<arg_name>", "value").replace("<const>", "")}, GError **error)
-    % endif
-{
-    % if "gsize n_" in prop.declare()[0]:
-    g_assert(n_value && value);
-    % else:
-    g_assert(value);
-    % endif
-    % for line in prop.declare():
-        % if "*" in line:
-    ${line.strip().replace("<arg_name>", "tmp_value").replace("<const>", "")} = NULL;
-        % else:
-    ${line.strip().replace("<arg_name>", "tmp_value").replace("<const>", "")};
-        % endif
-    % endfor
-    GVariant *out = NULL;
-
-    gint ret = lb_impl.read_property((LBO *)obj, &${properties}.${prop.name}, &out, error);
-    if (ret == 0 && out) {
-    % for line in prop.decode_func():
-        ${line.replace("<arg_in>", "tmp_value").replace("<arg_name>", "out")};
-    % endfor
-        *value = tmp_value;
-    % if "gsize n_" in prop.declare()[0]:
-        *n_value = n_tmp_value;
-    % endif
-    }
-    if (out) {
-        g_variant_unref(out);
-    }
-    return ret;
-}
-
 % endif
 % endfor
 
@@ -116,10 +91,8 @@ static LBInterface _${class_name}_interface = {
     .name = "${intf.name}",
     .properties = (LBProperty *)&${properties},
     .interface = NULL, /* load from usr/share/dbus-1/interfaces/${intf.name}.xml by lb_init */
-#ifdef LB_CODEGEN_BE_5_4
     .alias = "${class_name}",
     .object_template = "${intf.object_path}",
-#endif
 };
 
 static LBBase *_get_real_object(LBO *obj)
@@ -155,7 +128,7 @@ static void _${class_name}_destroy(LBO *obj)
  */
 static LBO *_${class_name}_create(const gchar *name, gpointer opaque)
 {
-    struct _${intf.alias} *obj = g_new0(struct _${intf.alias}, 1);
+    struct _${intf.alias} *obj = g_malloc0(sizeof(struct _${intf.alias}) + sizeof(GVariant *) * ${intf.alias}_PROP_COUNT);
     memcpy(obj->_base.magic, LB_MAGIC, strlen(LB_MAGIC) + 1);
     obj->_base.lock = g_new0(GRecMutex, 1);
     g_rec_mutex_init(obj->_base.lock);