lbkit 0.9.5__tar.gz → 0.9.6__tar.gz

{lbkit-0.9.5/lbkit.egg-info → lbkit-0.9.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lbkit
-Version: 0.9.5
+Version: 0.9.6
 Summary: Tools provided by litebmc.com
 Home-page: https://www.litebmc.com
 Author: xuhj@litebmc.com

lbkit-0.9.6/lbkit/__init__.py

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

{lbkit-0.9.5 → lbkit-0.9.6}/lbkit/build_conan_parallel.py

@@ -21,7 +21,7 @@ class BuildConanParallel(object):
     def _build_package(self, logfile, build_args, public_args):
         cmd = f"conan install {build_args} {public_args} --lockfile={self.lockfile} --lockfile-partial"
         log.info("{}build start:    '{}".format(Color.GREEN, Color.RESET_ALL) + cmd + '  log file: ' + logfile)
-        tools.exec(cmd, ignore_error=True, log_name=logfile, echo_cmd=False)
+        tools.exec(cmd, log_name=logfile, echo_cmd=False)
         log.info("{}build finished: '{}".format(Color.GREEN, Color.RESET_ALL) + cmd + '  log file: ' + logfile)
 
     def _build(self):

{lbkit-0.9.5 → lbkit-0.9.6}/lbkit/cli.py

@@ -11,7 +11,6 @@ from lbkit.component.build import BuildComponent
 from lbkit.component.test import TestComponent
 from lbkit.tasks.executor import Executor
 from lbkit.component.arg_parser import ArgParser
-from lbkit.ci_robot.gitee import Gitee
 from lbkit.log import Logger
 from lbkit import misc
 from lbkit import errors
@@ -91,14 +90,6 @@ class Command(object):
             exe = Executor(env)
             exe.run()
 
-    def gitee(self, *args):
-        """
-        Call gitee api.
-
-            CI场景调用gitee的API完成像标签、评论等基本操作
-        """
-        _ = Gitee(sys.argv[2:])
-
     # test package
     def test(self, *args):
         """
@@ -122,7 +113,6 @@ class Command(object):
                 ("Build Component commands", ["new", "build", "test"]),
                 ("Build Product commands", ["build"]),
                 ("Misc commands", ["help"]),
-                ("CI Robot commands", ["gitee"])
                ]
 
         def check_all_commands_listed():

{lbkit-0.9.5 → lbkit-0.9.6}/lbkit/codegen/idf_interface.py

@@ -124,6 +124,8 @@ CTYPE_SIGNATURE_MAP = {
 }
 
 def get_intfname_and_ctype(class_alias: str, ctype: str):
+    if ctype == "self":
+        return class_alias, class_alias
     match = re.findall(r"([\w][\w\d]*)", ctype)
     intf = ".".join(match[:-1])
     ctype = match[-1]
@@ -426,6 +428,8 @@ class IdfCtypeRender():
             if is_array:
                 # 结构体数组初始化时为二级空指针，以空指针结束
                 return [f"{stru_name} *<const>*<arg_name>"]
+            elif stru_name == self.intf.alias:
+                return [f"<const>struct _{stru_name} *<arg_name>"]
             else:
                 # 结构体成员初始化时为空结构体，由反序列化时填充内容
                 return [f"<const>{stru_name} *<arg_name>"]

{lbkit-0.9.5 → lbkit-0.9.6}/lbkit/codegen/template/public.c.mako

@@ -971,7 +971,7 @@ static ${class_name}_Properties _${class_name}_properties =
 % if (prop.signature in ["b", "y", "n", "q", "i", "u", "x", "t", "d", "o", "s", "g", "ab", "ay", "an", "aq", "ai", "au", "ax", "at", "ad", "as", "ao", "ag"] and prop.val_validate()):
         .check = ${class_name}_check_${prop.name}_variant,
 % else:
-<% match = re.match(f"^array\[enum\[(.*)\]\]$", prop.ctype) %>\
+<% match = re.match(rf"^array\[enum\[(.*)\]\]$", prop.ctype) %>\
     % if match:
 <% match_enum = re.findall(r"([\w][\w\d]*)", match.group(1)) %>\
             % if match_enum[0] == "self":
@@ -980,7 +980,7 @@ static ${class_name}_Properties _${class_name}_properties =
         .check = ${match_enum[0]}_${match_enum[-1]}_check_enum_variant_v,
             % endif
     % else:
-<% match = re.match(f"^enum\[(.*)\]$", prop.ctype) %>\
+<% match = re.match(rf"^enum\[(.*)\]$", prop.ctype) %>\
         % if match:
 <% match_enum = re.findall(r"([\w][\w\d]*)", match.group(1)) %>\
             % if match_enum[0] == "self":

{lbkit-0.9.5 → lbkit-0.9.6}/lbkit/component/build.py

@@ -97,8 +97,7 @@ class BuildComponent():
         for pkg_option in self.options.pkg_options:
             self.base_cmd += " -o " + pkg_option
         self.base_cmd += f" -o */*:codegen_version={self.options.codegen_version}"
-        if self.name == "lb_base":
-            self.base_cmd += f" -o */*:compatible_required={self.codegen_version.info.lb_base_compatible_required}"
+        self.base_cmd += f" -o */*:compatible_required={self.codegen_version.info.lb_base_compatible_required}"
 
     @staticmethod
     def _check_conanfile_if_tracked():

{lbkit-0.9.5 → lbkit-0.9.6}/lbkit/log.py

@@ -39,7 +39,7 @@ class Logger:
             retention="30 days",
             compression="zip",
             level="DEBUG",
-            colorize=None
+            colorize=False
         )
         Logger._lock = False
 
@@ -75,7 +75,7 @@ class Logger:
             format=format_str,
             level=level,
             filter=lambda record: record["level"].no < 40 and "tofile" not in record["extra"],  # < ERROR level
-            colorize=None
+            colorize=True
         )
 
         # Add handler for error messages (stderr)
@@ -84,7 +84,7 @@ class Logger:
             format=format_str,
             level="ERROR",
             filter= lambda record: "tofile" not in record["extra"],
-            colorize=None
+            colorize=True
         )
         Logger._configured = True
         Logger._lock = False

{lbkit-0.9.5 → lbkit-0.9.6}/lbkit/tasks/task_build_manifest.py

@@ -7,6 +7,7 @@ from lbkit.tasks.config import Config
 from lbkit.tasks.task import Task
 from lbkit.build_conan_parallel import BuildConanParallel
 from lbkit.codegen.codegen import __version__ as codegen_version
+from lbkit.codegen.codegen import Version
 
 
 
@@ -36,6 +37,8 @@ class TaskClass(Task):
         if cv == "latest":
             cv = codegen_version.str
         self.common_args += " -o */*:codegen_version=" + cv
+        version_info = Version(cv)
+        self.common_args += " -o */*:compatible_required=" + version_info.info.lb_base_compatible_required
         os.environ["CODEGEN_VERSION"] = cv
 
     def deploy(self, graph_file):

{lbkit-0.9.5 → lbkit-0.9.6}/lbkit/tools.py

@@ -151,7 +151,10 @@ class Tools(object):
         else:
             tee.write(show_cmd, True, False)
         real_cmd = self._real_command(cmd)
-        result = subprocess.Popen(real_cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True, text=True)
+        env = os.environ.copy()
+        env["FORCE_COLOR"] = "1"
+        env["CLICOLOR_FORCE"] = "1"
+        result = subprocess.Popen(real_cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True, text=True, env=env)
         if result is None:
             raise errors.RunCommandException(f"Run command {show_cmd} failed")
         stdout_t = threading.Thread(target=tee.pipe_to_logger, args=(result.stdout, True))

{lbkit-0.9.5 → lbkit-0.9.6/lbkit.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lbkit
-Version: 0.9.5
+Version: 0.9.6
 Summary: Tools provided by litebmc.com
 Home-page: https://www.litebmc.com
 Author: xuhj@litebmc.com

{lbkit-0.9.5 → lbkit-0.9.6}/lbkit.egg-info/SOURCES.txt

@@ -19,7 +19,6 @@ lbkit.egg-info/entry_points.txt
 lbkit.egg-info/requires.txt
 lbkit.egg-info/top_level.txt
 lbkit/ci_robot/__init__.py
-lbkit/ci_robot/gitee.py
 lbkit/codegen/__init__.py
 lbkit/codegen/codegen.py
 lbkit/codegen/ctype_defination.py

lbkit-0.9.5/lbkit/__init__.py

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

lbkit-0.9.5/lbkit/ci_robot/gitee.py

@@ -1,250 +0,0 @@
-"""GITEE API"""
-import os
-import argparse
-import inspect
-import requests
-import json
-import re
-from argparse import ArgumentParser
-from lbkit import errors
-from lbkit.tools import Tools
-from lbkit.log import Logger
-from argparse import RawTextHelpFormatter
-
-tools = Tools()
-log = tools.log
-cwd = os.getcwd()
-lb_cwd = os.path.split(os.path.realpath(__file__))[0]
-
-class GiteeArgument(object):
-    def __init__(self, option_str, help_info, default=None, required=False, action=None):
-        self.option_str = option_str
-        self.help_info = help_info
-        self.default = default
-        self.required = required
-        self.action = action
-
-class GiteeCommandInfo(object):
-    def __init__(self, name, desc, callback_name):
-        self.name = name
-        self.desc = desc
-        self.callback_name = callback_name
-        self.args: list[GiteeArgument] = []
-        self.args.append(GiteeArgument("--token", help_info="user's private token", default=None))
-        self.args.append(GiteeArgument("--repo", help_info="repository name", default=None))
-        self.args.append(GiteeArgument("--owner", help_info="repository owner", default=None))
-
-class Gitee():
-    def __init__(self, args=None):
-        Logger("gitee.log")
-        parser = argparse.ArgumentParser(
-            description="Build component", formatter_class=RawTextHelpFormatter)
-        sub_parser = parser.add_subparsers(help="sub-commands help")
-        cmd_map = {}
-        for key, value in self.__class__.__dict__.items():
-            if key.endswith("_args") and isinstance(value, staticmethod):
-                method = getattr(Gitee, key)
-                info: GiteeCommandInfo = method()
-                sub:ArgumentParser = sub_parser.add_parser(info.name, help=info.desc)
-                for arg in info.args:
-                    sub.add_argument(arg.option_str, help=arg.help_info, default=arg.default, required=arg.required, action=arg.action)
-                cmd_map[info.name] = info
-
-        self.options = parser.parse_args(args)
-        self.token = None
-        self.repo = None
-        self.owner = None
-        # 处理公共的参数
-        self.parse_public_argument()
-        sub_cmd = args[0]
-        info: GiteeCommandInfo = cmd_map.get(sub_cmd)
-        if info is None:
-            raise errors.LiteBmcException(f"Command {sub_cmd} not found")
-        for member in inspect.getmembers(self, predicate=inspect.ismethod):
-            if member[0] != info.callback_name:
-                continue
-            try:
-                return member[1]()
-            except json.JSONDecodeError as e:
-                raise errors.RunCommandException("Json decode failed") from e
-            except Exception as e:
-                raise errors.HttpRequestException(f"Request failed, repo: {self.owner}/{self.repo}, method: {info.callback_name}") from e
-        raise errors.RunCommandException(f"Request failed, repo: {self.owner}/{self.repo}, method {info.callback_name} not found")
-
-    def parse_public_argument(self):
-        self.token = os.environ.get("GITEE_TOKEN")
-        if self.options.token is not None:
-            self.token = self.options.token
-        if self.token is None:
-            raise errors.ArgException("Call gitee failed, you must set environment GITEE_TOKEN or run command with --token option")
-        self.check_parameter_format("token", f"^[a-z0-9]+$", self.token)
-
-        self.owner = os.environ.get("giteeTargetNamespace")
-        if not self.owner:
-            self.owner = os.environ.get("giteeSourceNamespace")
-        if self.options.owner is not None:
-            self.owner = self.options.owner
-        if self.owner is None:
-            raise errors.ArgException("Call gitee failed, you must set environment giteeTargetNamespace or run command with --owner option")
-        self.check_parameter_format("owner", f"^[a-z0-9_a-z-]+$", self.owner)
-
-        self.repo = os.environ.get("giteeTargetRepoName")
-        if not self.repo:
-            self.repo = os.environ.get("giteeSourceRepoName")
-        if self.options.repo is not None:
-            self.repo = self.options.repo
-        if self.repo is None:
-            raise errors.ArgException("Call gitee failed, you must set environment giteeTargetRepoName or run command with --repo option")
-        self.check_parameter_format("repo", f"^[a-z0-9_a-z-]+$", self.repo)
-
-    @staticmethod
-    def check_parameter_format(name, regex, value):
-        if re.match(regex, value) is None:
-            raise errors.ArgException(f"Call gitee failed, The {name} does not satisfy the regular expression {regex}")
-
-    @staticmethod
-    def pr_add_label_args() -> GiteeCommandInfo:
-        info = GiteeCommandInfo("add_label", "Add a new label for special PR", "pr_add_label")
-        info.args.append(GiteeArgument("--label", help_info="label name, sparate with ',' if you want add multiple labels", required=True))
-        info.args.append(GiteeArgument("--id", help_info="PR id", required=True))
-        info.args.append(GiteeArgument("--replace", help_info="delete all labels before add", action="store_true"))
-        return info
-
-    def pr_add_label(self):
-        self.check_parameter_format("label", "^[a-z0-9A-Z.\-,]+$", self.options.label)
-        url = f"https://gitee.com/api/v5/repos/{self.owner}/{self.repo}/pulls/{self.options.id}/labels?access_token={self.token}"
-        body = self.options.label.split(",")
-        resp = requests.post(url, json=body)
-        if resp.status_code != 201:
-            raise errors.HttpRequestException(f"Add label failed, repo: {self.owner}/{self.repo}.git, pr: {self.options.id}, code: {resp.status_code}")
-        log.info(f"Add label {self.options.label} successfully, repo: {self.owner}/{self.repo}.git, pr: {self.options.id}")
-        if not self.options.replace:
-            return
-        body = json.loads(resp.content)
-        wait_delete_labels = []
-        for label in body:
-            name = label.get("name")
-            if name != self.options.label:
-                wait_delete_labels.append(name)
-        if len(wait_delete_labels):
-            req = ",".join(wait_delete_labels)
-            url = f"https://gitee.com/api/v5/repos/{self.owner}/{self.repo}/pulls/{self.options.id}/labels/{req}?access_token={self.token}"
-            resp = requests.delete(url)
-            if resp.status_code == 204:
-                log.info(f"Delete labels({req}) successfully, repo: {self.owner}/{self.repo}.git, pr: {self.options.id}")
-
-    @staticmethod
-    def pr_del_label_args() -> GiteeCommandInfo:
-        info = GiteeCommandInfo("del_label", "Delete a label for special PR", "pr_del_label")
-        info.args.append(GiteeArgument("--label", help_info="label name, sparate with ',' if you want delete multiple labels", required=True))
-        info.args.append(GiteeArgument("--id", help_info="PR id", required=True))
-        return info
-
-    def pr_del_label(self):
-        self.check_parameter_format("label", "^[a-z0-9A-Z.\-,]+$", self.options.label)
-        url = f"https://gitee.com/api/v5/repos/{self.owner}/{self.repo}/pulls/{self.options.id}/labels/{self.options.label}?access_token={self.token}"
-        resp = requests.delete(url)
-        if resp.status_code == 204:
-            log.info(f"Delete labels({self.options.label}) successfully, repo: {self.owner}/{self.repo}.git, pr: {self.options.id}")
-
-    @staticmethod
-    def pr_add_comment_args() -> GiteeCommandInfo:
-        info = GiteeCommandInfo("add_comment", "Add comments with special content", "pr_add_comment")
-        info.args.append(GiteeArgument("--comment", help_info="comment", required=True))
-        info.args.append(GiteeArgument("--id", help_info="PR id", default=None))
-        info.args.append(GiteeArgument("--sha", help_info="COMMIT sha", default=None))
-        return info
-
-    def pr_add_comment(self):
-        if self.options.id is not None:
-            self.check_parameter_format("id", "^[0-9]+$", self.options.id)
-            url = f"https://gitee.com/api/v5/repos/{self.owner}/{self.repo}/pulls/{self.options.id}/comments"
-            body = {
-                "access_token": self.token,
-                "body": self.options.comment
-            }
-            resp = requests.post(url, json=body)
-            if resp.status_code != 201:
-                raise errors.HttpRequestException(f"Add comment {self.options.comment} failed, repo: {self.owner}/{self.repo}.git, " +
-                                                  f"PR: {self.options.id}, status code: {resp.status_code}")
-            body = json.loads(resp.content)
-            id = body.get("id")
-            log.info(f"Add comment {self.options.comment} successfully, comment id: {id} repo: {self.owner}/{self.repo}.git, " +
-                     f"PR: {self.options.id}")
-        if self.options.sha is not None:
-            self.check_parameter_format("id", "^[0-9a-fA-F]{40}$", self.options.sha)
-            url = f"https://gitee.com/api/v5/repos/{self.owner}/{self.repo}/commits/{self.options.sha}/comments"
-            body = {
-                "access_token": self.token,
-                "body": self.options.comment
-            }
-            resp = requests.post(url, json=body)
-            if resp.status_code != 201:
-                raise errors.HttpRequestException(f"Add comment {self.options.comment} failed. repo: {self.owner}/{self.repo}.git, " +
-                                                  f"SHA: {self.options.sha}, status code: {resp.status_code}")
-            body = json.loads(resp.content)
-            id = body.get("id")
-            log.info(f"Add comment {self.options.comment} successfully, comment id: {id} repo: {self.owner}/{self.repo}.git, " +
-                     f"SHA: {self.options.sha}")
-
-    @staticmethod
-    def pr_del_comment_args() -> GiteeCommandInfo:
-        info = GiteeCommandInfo("del_comment", "Delete comments with special content", "pr_del_comment")
-        info.args.append(GiteeArgument("--comment", help_info="comment", required=True))
-        info.args.append(GiteeArgument("--id", help_info="PR id", required=True))
-        return info
-
-    def pr_del_comment(self):
-        self.check_parameter_format("id", "^[0-9]+$", self.options.id)
-        url = f"https://gitee.com/api/v5/repos/{self.owner}/{self.repo}/pulls/{self.options.id}/comments"
-        get_url = url + f"?access_token={self.token}&page=1&per_page=100"
-        response = requests.get(get_url)
-        body = json.loads(response.content)
-        if not isinstance(body, list):
-            raise errors.HttpRequestException("Get all comment failed, not a list return")
-        for content in body:
-            id = content.get("id")
-            if id is None:
-                raise errors.HttpRequestException("Get invalid comment id")
-            body = content.get("body")
-            if body.strip() != self.options.comment:
-                continue
-            url = f"https://gitee.com/api/v5/repos/{self.owner}/{self.repo}/pulls/comments/{id}?access_token={self.token}"
-            resp = requests.delete(url)
-            if resp.status_code != 204:
-                raise errors.HttpRequestException(f"Delete comment {id} failed, code: {resp.status_code}")
-            log.info(f"Delete comment {body} successfully, repo: {self.owner}/{self.repo}.git, pr: {self.options.id}")
-
-    @staticmethod
-    def pr_set_test_state_args() -> GiteeCommandInfo:
-        info = GiteeCommandInfo("set_test_state", "Set test OK", "pr_set_test_state")
-        info.args.append(GiteeArgument("--id", help_info="PR id", required=True))
-        return info
-
-    def pr_set_test_state(self):
-        self.check_parameter_format("id", "^[0-9]+$", self.options.id)
-        body = {
-            "access_token": self.token
-        }
-        url = f"https://gitee.com/api/v5/repos/{self.owner}/{self.repo}/pulls/{self.options.id}/test"
-        resp = requests.post(url, json=body)
-        if resp.status_code != 204:
-            raise errors.HttpRequestException(f"Set test OK failed, repo: {self.owner}/{self.repo}.git, pr: {self.options.id}, code: {resp.status_code}")
-        log.info(f"Set test OK successfully, repo: {self.owner}/{self.repo}.git, pr: {self.options.id}")
-
-    @staticmethod
-    def pr_reset_test_state_args() -> GiteeCommandInfo:
-        info = GiteeCommandInfo("reset_test_state", "Reset test state", "pr_reset_test_state")
-        info.args.append(GiteeArgument("--id", help_info="PR id", required=True))
-        return info
-
-    def pr_reset_test_state(self):
-        self.check_parameter_format("id", "^[0-9]+$", self.options.id)
-        body = {
-            "access_token": self.token
-        }
-        url = f"https://gitee.com/api/v5/repos/{self.owner}/{self.repo}/pulls/{self.options.id}/testers"
-        resp = requests.patch(url, json=body)
-        if resp.status_code != 200:
-            raise errors.HttpRequestException(f"Reset test status failed, repo: {self.owner}/{self.repo}.git, pr: {self.options.id}, code: {resp.status_code}")
-        log.info(f"Reset test state successfully, repo: {self.owner}/{self.repo}.git, pr: {self.options.id}")