From 32fe737bd8357b463f4553219d60ee5c591aef2a Mon Sep 17 00:00:00 2001
From: Mathieu Benoit <mathben@technolibre.ca>
Date: Tue, 11 Nov 2025 09:34:14 -0500
Subject: [PATCH] [UPD] script search class model: remove astor and update
 code, add parameters

---
 .../requirements.odoo18.0_python3.12.10.txt   |  3 --
 script/code_generator/search_class_model.py   | 48 ++++++++++++-------
 2 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/requirement/requirements.odoo18.0_python3.12.10.txt b/requirement/requirements.odoo18.0_python3.12.10.txt
index 5cb971d..53bddee 100644
--- a/requirement/requirements.odoo18.0_python3.12.10.txt
+++ b/requirement/requirements.odoo18.0_python3.12.10.txt
@@ -67,6 +67,3 @@ git+https://github.com/prauscher/pysaml2.git@replace-pyopenssl
 
 # Fix compilation, until pymssql==2.3.9 is release
 git+https://github.com/pymssql/pymssql.git
-
-# Force last version, because too old into pip
-git+https://github.com/berkerpeksag/astor.git
diff --git a/script/code_generator/search_class_model.py b/script/code_generator/search_class_model.py
index f04557a..1b8f92c 100755
--- a/script/code_generator/search_class_model.py
+++ b/script/code_generator/search_class_model.py
@@ -10,8 +10,6 @@ import os
 import sys
 from pathlib import Path
 
-import astor
-
 logging.basicConfig(level=logging.DEBUG)
 _logger = logging.getLogger(__name__)
 
@@ -57,6 +55,16 @@ def get_config():
         action="store_true",
         help="Return result in json",
     )
+    parser.add_argument(
+        "--format_json",
+        action="store_true",
+        help="If --json is enabled, will format json for human reader.",
+    )
+    parser.add_argument(
+        "--show_error_json",
+        action="store_true",
+        help="Will show error when --json is enabled.",
+    )
     parser.add_argument(
         "--extract_field",
         action="store_true",
@@ -124,7 +132,7 @@ def search_and_replace(
 
 
 def extract_lambda(node):
-    result = astor.to_source(node).strip().replace("\n", "")
+    result = ast.unparse(node)
     if result[0] == "(" and result[-1] == ")":
         result = result[1:-1]
     return result
@@ -134,13 +142,9 @@ def fill_search_field(ast_obj, var_name="", py_filename=""):
     ast_obj_type = type(ast_obj)
     result = None
     if ast_obj_type is ast.Constant:
-        result = ast_obj.s
+        result = ast_obj.value
     elif ast_obj_type is ast.Lambda:
         result = extract_lambda(ast_obj)
-    elif ast_obj_type is ast.NameConstant:
-        result = ast_obj.value
-    elif ast_obj_type is ast.Num:
-        result = ast_obj.n
     elif ast_obj_type is ast.UnaryOp:
         if type(ast_obj.op) is ast.USub:
             # value is negative
@@ -232,15 +236,15 @@ def main():
                                 lst_search_target
                                 and node.targets[0].id in lst_search_target
                             ):
-                                if node.value.s in lst_model_name:
+                                if node.value.value in lst_model_name:
                                     is_duplicated = True
                                     _logger.warning(
                                         "Duplicated model name"
-                                        f" {node.value.s} from file {py_file}"
+                                        f" {node.value.value} from file {py_file}"
                                     )
                                 else:
-                                    model_name = node.value.s
-                                    lst_model_name.append(node.value.s)
+                                    model_name = node.value.value
+                                    lst_model_name.append(node.value.value)
 
                             if (
                                 lst_search_inherit_target
@@ -248,14 +252,16 @@ def main():
                                 in lst_search_inherit_target
                             ):
                                 is_inherit = True
-                                if node.value.s in lst_model_inherit_name:
+                                if node.value.value in lst_model_inherit_name:
                                     _logger.warning(
                                         "Duplicated model inherit name"
-                                        f" {node.value.s} from file {py_file}"
+                                        f" {node.value.value} from file {py_file}"
                                     )
                                 else:
-                                    model_name = node.value.s
-                                    lst_model_inherit_name.append(node.value.s)
+                                    model_name = node.value.value
+                                    lst_model_inherit_name.append(
+                                        node.value.value
+                                    )
                             dct_fields = {}
                             if model_name:
                                 dct_model[model_name] = {
@@ -267,7 +273,7 @@ def main():
                             # TODO do it!
                             if model_name and (
                                 type(node.value) is ast.Constant
-                                and node.value.s == model_name
+                                and node.value.value == model_name
                                 or type(node.value) is ast.List
                                 and model_name
                                 in [a.s for a in node.value.elts]
@@ -312,7 +318,13 @@ def main():
             print(models_name)
             print(models_inherit_name)
     else:
-        output = json.dumps(dct_model)
+        if config.show_error_json and not models_name:
+            _logger.warning(f"Missing models class in {config.directory}")
+
+        if config.format_json:
+            output = json.dumps(dct_model, indent=4, sort_keys=True)
+        else:
+            output = json.dumps(dct_model)
         print(output)
 
     if config.template_dir: