[FIX] server: adapt code for cattrs==23.2.1

new lib version doesn't allow int as severity parameter, but enum only

Author: fda-odoo

server/core/module.py

@@ -6,15 +6,8 @@
 from .python_arch_builder import PythonArchBuilder
 from ..references import RegisteredRef
 from .symbol import ConcreteSymbol
-from lsprotocol.types import (CompletionItem, CompletionList, CompletionOptions,
-                             CompletionParams, ConfigurationItem,
-                             ConfigurationParams, Diagnostic, DiagnosticTag,
-                             DidChangeTextDocumentParams,
-                             DidCloseTextDocumentParams,
-                             DidOpenTextDocumentParams, MessageType, Position,
-                             Range, Registration, RegistrationParams,
-                             SemanticTokens, SemanticTokensLegend, SemanticTokensParams,
-                             Unregistration, UnregistrationParams)
+from lsprotocol.types import (Diagnostic, DiagnosticTag, Position,
+                             Range, DiagnosticSeverity)
 
 class ModuleSymbol(ConcreteSymbol):
 
@@ -71,7 +64,7 @@ def load_manifest(self, fileInfo):
                 ),
                 message = "A manifest should only contains one dictionnary",
                 source = EXTENSION_NAME,
-                severity= 1,
+                severity= DiagnosticSeverity.Error,
             )]
         dic = ast_body[0].value
         self.module_name = ""
@@ -116,7 +109,7 @@ def load_manifest(self, fileInfo):
                     message = "'active' is deprecated and has been replaced by 'auto_install'",
                     source = EXTENSION_NAME,
                     tags=[DiagnosticTag.Deprecated],
-                    severity= 1,
+                    severity= DiagnosticSeverity.Error,
                 ))
             else:
                 if key.value not in ["version", "description", "author", "website", "license",
@@ -129,7 +122,7 @@ def load_manifest(self, fileInfo):
             self.depends.append("base")
         return diags
 
-    def _create_diag(self, node, message, severity=1):
+    def _create_diag(self, node, message, severity=DiagnosticSeverity.Error):
         return Diagnostic(
             range = Range(
                 start=Position(line=node.lineno-1, character=node.col_offset+1),

server/core/python_arch_eval.py

@@ -11,7 +11,7 @@
 from ..python_utils import PythonUtils
 from ..references import *
 from .import_resolver import *
-from lsprotocol.types import (Diagnostic,MessageType,Position, Range)
+from lsprotocol.types import (Diagnostic,MessageType,Position, Range, DiagnosticSeverity)
 
 
 class PythonArchEval(ast.NodeVisitor):
@@ -106,7 +106,7 @@ def eval_symbols_from_import_stmt(self, from_stmt, name_aliases, level, node):
                         ),
                         message = ".".join(file_tree + [node_alias.name]) + " not found",
                         source = EXTENSION_NAME,
-                        severity = 2
+                        severity = DiagnosticSeverity.Warning
                     ))
             else:
                 if (file_tree + node_alias.name.split("."))[0] in BUILT_IN_LIBS:
@@ -122,7 +122,7 @@ def eval_symbols_from_import_stmt(self, from_stmt, name_aliases, level, node):
                         ),
                         message = ".".join(file_tree + [node_alias.name]) + " not found",
                         source = EXTENSION_NAME,
-                        severity = 2
+                        severity = DiagnosticSeverity.Warning
                     ))
 
     def visit_Try(self, node):
@@ -180,7 +180,7 @@ def _create_diagnostic_base_not_found(self, symbol, not_found_name, node, full_n
                 ),
                 message = "Base class " + full_name + " not found",
                 source = EXTENSION_NAME,
-                severity= 2,
+                severity= DiagnosticSeverity.Warning,
             )
         )
 
@@ -226,7 +226,7 @@ def load_base_class(self, symbol, node):
                             ),
                             message = "Base class " + full_base + " is not a class",
                             source = EXTENSION_NAME,
-                            severity= 2,
+                            severity= DiagnosticSeverity.Warning,
                         )
                     )
                     continue

server/features/validation/python_validator.py

@@ -7,7 +7,7 @@
 from ...python_utils import PythonUtils
 from ...core.file_mgr import FileMgr
 from ...core.import_resolver import resolve_import_stmt
-from lsprotocol.types import (Diagnostic,DiagnosticTag,Position, Range)
+from lsprotocol.types import (Diagnostic,DiagnosticTag,Position, Range, DiagnosticSeverity)
 
 class ClassContentCacheValidator():
 
@@ -99,7 +99,7 @@ def _resolve_import(self, from_stmt, name_aliases, level, node):
                         ),
                         message = module.dir_name + " is not in the dependencies of the module",
                         source = EXTENSION_NAME,
-                        severity = 2
+                        severity = DiagnosticSeverity.Warning
                     ))
 
     def visit_Assign(self, node):
@@ -286,7 +286,7 @@ def validate_structure(self):
                     message = symbol.eval.get_symbol().name + " is deprecated: " + symbol.eval.get_symbol().deprecated_reason,
                     source = EXTENSION_NAME,
                     tags=[DiagnosticTag.Deprecated],
-                    severity = 3
+                    severity = DiagnosticSeverity.Information
                 ))
             if symbol.type == SymType.CLASS:
                 if symbol.modelData:
@@ -307,7 +307,7 @@ def validate_structure(self):
                                 ),
                                 message = inherit + " does not exist",
                                 source = EXTENSION_NAME,
-                                severity = 1
+                                severity = DiagnosticSeverity.Error
                             ))
                         else:
                             inherited_models = model.get_main_symbols(self.currentModule)
@@ -320,7 +320,7 @@ def validate_structure(self):
                                 ),
                                 message = "This model is ambiguous. Please fix your dependencies or avoid using same model name in different modules",
                                 source = EXTENSION_NAME,
-                                severity = 1
+                                severity = DiagnosticSeverity.Error
                             ))
                             elif not inherited_models:
                                 model_syms = model.get_main_symbols()
@@ -337,5 +337,5 @@ def validate_structure(self):
                                     ),
                                     message = inherit + " is not in your dependencies. Please review the dependencies of your module to add " + models + " in it",
                                     source = EXTENSION_NAME,
-                                    severity = 1
+                                    severity = DiagnosticSeverity.Error
                                 ))