GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-06-30 08:05:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Refactor formulas.py for improved formula handling

Browse Source 
Imported difflib, re, and CuraFormulaFunctions for more efficient formula handling and error checking. This prevents crashes and improves the reliability of the application by suggesting the correct formula when an incorrect one is entered

CURA-10901
This commit is contained in:
Saumya Jain 2024-04-08 15:26:55 +02:00
parent e15049f2e0
commit eecf9cdebf
1 changed files with 29 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
printer-linter/src/printerlinter/linters/formulas.py
View File

@ -1,32 +1,24 @@
import difflib
import json
import os
import re
from pathlib import Path
from typing import Iterator
from UM.VersionUpgradeManager import VersionUpgradeManager
from unittest.mock import MagicMock
from cura.Settings.CuraFormulaFunctions import CuraFormulaFunctions
from ..diagnostic import Diagnostic
from .linter import Linter
from configparser import ConfigParser
from cura.CuraApplication import CuraApplication # To compare against the current SettingVersion.
from UM.Settings.DefinitionContainer import DefinitionContainer
class Formulas(Linter):
""" Finds issues in definition files, such as overriding default parameters """
def __init__(self, file: Path, settings: dict) -> None:
super().__init__(file, settings)
self._all_keys = self.collectAllSettingIds()
self._cura_formula_functions = CuraFormulaFunctions(self)
self._correct_formulas = ["extruderValue", "extruderValues", "anyExtruderWithMaterial", "anyExtruderNrWithOrDefault"
, "resolveOrValue", "defaultExtruderPosition", "valueFromContainer", "extruderValueFromContainer"]
self._definition = {}
def collectAllSettingIds(self):
VersionUpgradeManager._VersionUpgradeManager__instance = VersionUpgradeManager(MagicMock())
CuraApplication._initializeSettingDefinitions()
definition_container = DefinitionContainer("whatever")
with open(os.path.join(os.path.dirname(__file__), "..", "..","..","..", "resources", "definitions", "fdmprinter.def.json"),
encoding="utf-8") as data:
definition_container.deserialize(data.read())
return definition_container.getAllKeys()
def check(self) -> Iterator[Diagnostic]:
if self._settings["checks"].get("diagnostic-incorrect-formula", False):
for check in self.checkFormulas():
@ -46,11 +38,10 @@ class Formulas(Linter):
if value in ("enable", "resolve", "value", "minimum_value_warning", "maximum_value_warning", "maximum_value", "minimum_value"):
value_incorrect = self.checkValueIncorrect(value_dict[value].strip("="))
if value_incorrect:
yield Diagnostic(
file=self._file,
diagnostic_name="diagnostic-incorrect-formula",
message=f"Given formula {value_dict} to calulate {key} of seems incorrect, please correct the formula and try again.",
message=f"Given formula {value_dict} to calulate {key} of seems incorrect, Do you mean {self._correct_formula}? please correct the formula and try again.",
level="Error",
offset=1
)
@ -89,8 +80,25 @@ class Formulas(Linter):
return file_data
def checkValueIncorrect(self, formula:str) -> bool:
try:
compiled_formula = compile(formula, "", "eval")
except SyntaxError:
self._correct_formula = self._correctFormula(formula)
if self._correct_formula == formula:
return False
else:
return True
return False
def _correctFormula(self, input_sentence: str) -> str:
# Find all alphanumeric words, '()' and content inside them, and punctuation
chunks = re.split(r'(\(.*?\))', input_sentence) # split input by parentheses
corrected_chunks = []
for chunk in chunks:
if chunk.startswith('(') and chunk.endswith(')'): # if chunk is a formula in parentheses
corrected_chunks.append(chunk) # leave it as is
else: # if chunk is outside parentheses
words = re.findall(r'\w+', chunk) # find potential function names
for word in words:
if difflib.get_close_matches(word, self._correct_formulas, n=1,cutoff=0.6): # if there's a close match in correct formulas
chunk = chunk.replace(word, difflib.get_close_matches(word, self._correct_formulas, n=1, cutoff=0.6)[0]) # replace it
corrected_chunks.append(chunk)
return ''.join(corrected_chunks) # join chunks back together