lbkit 0.8.1__tar.gz → 0.8.3__tar.gz

{lbkit-0.8.1/lbkit.egg-info → lbkit-0.8.3}/PKG-INFO

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

lbkit-0.8.3/lbkit/__init__.py

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

{lbkit-0.8.1 → lbkit-0.8.3}/lbkit/codegen/codegen.py

@@ -8,7 +8,6 @@ import json
 import yaml
 import argparse
 from lbkit.codegen.idf_interface import IdfInterface
-from lbkit.utils.version import Version, X_VER
 
 from mako.lookup import TemplateLookup
 from lbkit.log import Logger
@@ -21,16 +20,55 @@ log = Logger("codegen")
 
 
 class CodeGenHistory():
-    def __init__(self, lb_base: str, description: str):
+    def __init__(self, lb_base: str, description: str, lb_base_compatible_required: str):
         self.lb_base = lb_base
         self.description = description
+        # lb_base兼容性配置项
+        self.lb_base_compatible_required = lb_base_compatible_required
+
+
+class Version():
+    def __init__(self, ver_str):
+        if not re.match("^([0-9]|([1-9][0-9]*))\\.([0-9]|([1-9][0-9]*))$", ver_str):
+            raise Exception("Version string {ver_str} not match with regex ^([0-9]|([1-9][0-9]*))\\.([0-9]|([1-9][0-9]*))$")
+        self.info: CodeGenHistory = history_versions.get(ver_str)
+        chunks = ver_str.split(".")
+        self.major = int(chunks[0])
+        self.minor = int(chunks[1])
+        self.str = str(self.major) + "." + str(self.minor)
+
+    def bt(self, next_ver):
+        next = Version(next_ver)
+        if self.major > next.major or (self.major == next.major and self.minor > next.minor):
+            return True
+        return False
+
+    def be(self, next_ver):
+        next = Version(next_ver)
+        if self.major > next.major or (self.major == next.major and self.minor >= next.minor):
+            return True
+        return False
+
+    def lt(self, next_ver):
+        next = Version(next_ver)
+        if self.major < next.major or (self.major == next.major and self.minor < next.minor):
+            return True
+        return False
+
+    def le(self, next_ver):
+        next = Version(next_ver)
+        if self.major < next.major or (self.major == next.major and self.minor <= next.minor):
+            return True
+        return False
 
 # 历史自动生成版本号，计划用于用于生成代码稳定性测试
 # TODO： 支持生成代码稳定性测试，确保生成的代码一致性
 history_versions = {
-    "5.0": CodeGenHistory("lb_base/[>=0.8.1 <0.9.0]", "简化接口类名定义;简化枚举变量在接口间传递时的字符串定义")
+    "5.0": CodeGenHistory("lb_base/[>=0.8.1 <0.9.0]", "简化接口类名定义;简化枚举变量在接口间传递时的字符串定义", "0"),
+    "5.1": CodeGenHistory("lb_base/[>=0.8.3 <0.9.0]", "方法和信号添加保留字段用于功能扩展，同时设置请求和响应为空标志位", "8002"),
+    "5.2": CodeGenHistory("lb_base/[>=0.8.4 <0.9.0]", "支持校验数值边界、字符串正则以及数组匹配等规则", "8004"),
 }
-__version__=Version("5.0")
+__version__=Version("5.1")
 
 
 def version_check(ver_str: str):
@@ -44,10 +82,17 @@ def version_check(ver_str: str):
             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
 
 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 {__version__.str}, default: {default}
+    help=f'''must less than or equal to {codegen_version_max()}, default: {default}
 
         codegen versions:
         '''
@@ -60,6 +105,7 @@ class CodeGen(object):
     def __init__(self, args):
         self.args = args
         self.codegen_version = __version__
+        self.log_level = "NOTSET"
 
     def _gen(self, idf_file, directory=".", code_type="all"):
         directory = os.path.realpath(directory)
@@ -67,6 +113,7 @@ class CodeGen(object):
         code_types = ["server", "client", "public"]
         if code_type != "all":
             code_types = [code_type]
+        log.info(f"Codegen version: {self.codegen_version.str}")
         for ct in code_types:
             os.makedirs(os.path.join(directory, ct), exist_ok=True)
             out_file = os.path.join(directory, ct, interface.name + ".xml")
@@ -92,7 +139,7 @@ class CodeGen(object):
 
     def get_interface(self, idf_file):
         lookup = TemplateLookup(directories=os.path.join(lb_cwd, "template"))
-        return IdfInterface(lookup, idf_file, self.codegen_version)
+        return IdfInterface(lookup, idf_file, self.codegen_version, self.log_level)
 
     def run(self):
         """
@@ -105,6 +152,11 @@ class CodeGen(object):
                                          formatter_class=SmartFormatter)
         codegen_version_arg(parser)
         parser.add_argument("-d", "--directory", help='generate code directory', default=".")
+        parser.add_argument("-l", "--log_level", help='show log level',
+                            choices=[
+                                "CRITICAL", "FATAL", "ERROR", "WARN",
+                                "WARNING", "INFO", "DEBUG", "NOTSET",
+                            ], default=None)
         parser.add_argument("-t", "--codetype", help='code type, default: all', default="all", choices=["public", "server", "client", "all"])
         group2 = parser.add_argument_group('cdf file', 'Generate code using the specified CDF file')
         group2.add_argument("-c", "--cdf_file", help='component description file, default metadata/package.yml', default=None)
@@ -112,13 +164,18 @@ class CodeGen(object):
         group1.add_argument("-i", "--idf_file", help='A IDF file to be processed e.g.: com.litebmc.Upgrade.xml', default=None)
 
         args = parser.parse_args(self.args)
+        if args.log_level:
+            self.log_level = args.log_level
+            log.setLevel(self.log_level)
 
         if args.cdf_file:
             if not os.path.isfile(args.cdf_file):
                 raise ArgException(f"argument -c/--cdf_file: {args.cdf_file} not exist")
             configs = Helper.read_yaml(args.cdf_file, "codegen", [])
             # 为保障兼容，package.yml未指定版本号的，默认使用2，该版本配套lb_base/0.6.0版本，其LBProperty无set/get成员
-            ver_str = Helper.read_yaml(args.cdf_file, "codegen_version", args.codegen_version)
+            ver_str = os.environ.get("CODEGEN_VERSION")
+            if ver_str is None:
+                ver_str = Helper.read_yaml(args.cdf_file, "codegen_version", args.codegen_version)
             version_check(ver_str)
             self.codegen_version = Version(ver_str)
             for cfg in configs:
@@ -136,15 +193,18 @@ class CodeGen(object):
                 self._gen(file, outdir)
             return
         else:
-            version_check(args.codegen_version)
-            self.codegen_version = Version(args.codegen_version)
+            ver_str = os.environ.get("CODEGEN_VERSION")
+            if ver_str is None:
+                ver_str = args.codegen_version
+            version_check(ver_str)
+            self.codegen_version = Version(ver_str)
 
         intf_file = args.idf_file
         if not intf_file:
             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(__version__.str):
+        if self.codegen_version.bt(codegen_version_max()):
             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"):