aait 1.0.4.2__tar.gz → 1.0.5__tar.gz

{aait-1.0.4.2 → aait-1.0.5}/PKG-INFO

@@ -1,12 +1,11 @@
 Metadata-Version: 2.1
 Name: aait
-Version: 1.0.4.2
+Version: 1.0.5
 Summary: Advanced Artificial Intelligence Tools is a package meant to develop and enable advanced AI functionalities in Orange
 Home-page: 
 Author: Orange community
 Author-email: 
 Keywords: orange3 add-on
-License-File: License.txt
 Requires-Dist: torch==2.6.0; sys_platform != "darwin"
 Requires-Dist: torch==2.2.2; sys_platform == "darwin"
 Requires-Dist: sentence-transformers==3.3.1

{aait-1.0.4.2 → aait-1.0.5}/aait.egg-info/PKG-INFO

@@ -1,12 +1,11 @@
 Metadata-Version: 2.1
 Name: aait
-Version: 1.0.4.2
+Version: 1.0.5
 Summary: Advanced Artificial Intelligence Tools is a package meant to develop and enable advanced AI functionalities in Orange
 Home-page: 
 Author: Orange community
 Author-email: 
 Keywords: orange3 add-on
-License-File: License.txt
 Requires-Dist: torch==2.6.0; sys_platform != "darwin"
 Requires-Dist: torch==2.2.2; sys_platform == "darwin"
 Requires-Dist: sentence-transformers==3.3.1

{aait-1.0.4.2 → aait-1.0.5}/aait.egg-info/SOURCES.txt

@@ -1,4 +1,4 @@
-License.txt
+setup.cfg
 setup.py
 aait.egg-info/PKG-INFO
 aait.egg-info/SOURCES.txt
@@ -37,28 +37,14 @@ orangecontrib/AAIT/fix_torch/fix_torch_dll_error.py
 orangecontrib/AAIT/fix_torch/libomp140.x86_64.dll
 orangecontrib/AAIT/llm/GPT4ALL.py
 orangecontrib/AAIT/llm/GPT4ALL_killer.py
-orangecontrib/AAIT/llm/MergeBaseLora.py
-orangecontrib/AAIT/llm/SERV_kill_workflow.py
-orangecontrib/AAIT/llm/SERV_requests.py
-orangecontrib/AAIT/llm/SERV_start_workflow.py
-orangecontrib/AAIT/llm/Tutorial_Finetuning.py
-orangecontrib/AAIT/llm/Tutorial_TestFinetuning.py
 orangecontrib/AAIT/llm/__init__.py
 orangecontrib/AAIT/llm/answers.py
 orangecontrib/AAIT/llm/chunking.py
 orangecontrib/AAIT/llm/embeddings.py
-orangecontrib/AAIT/llm/finetuning.py
-orangecontrib/AAIT/llm/functions_DatasetGeneration.py
-orangecontrib/AAIT/llm/functions_Finetuning.py
 orangecontrib/AAIT/llm/lemmes.py
 orangecontrib/AAIT/llm/lmstudio.py
-orangecontrib/AAIT/llm/main_DatasetGeneration.py
-orangecontrib/AAIT/llm/main_Finetuning.py
 orangecontrib/AAIT/llm/process_documents.py
 orangecontrib/AAIT/llm/prompt_management.py
-orangecontrib/AAIT/llm/quickpy.py
-orangecontrib/AAIT/llm/test.py
-orangecontrib/AAIT/llm/test_functions.py
 orangecontrib/AAIT/llm/translations.py
 orangecontrib/AAIT/optimiser/__init__.py
 orangecontrib/AAIT/optimiser/optuna_multi.py
@@ -71,6 +57,7 @@ orangecontrib/AAIT/utils/check_data_in.py
 orangecontrib/AAIT/utils/delta_local_shared_fodler.py
 orangecontrib/AAIT/utils/import_uic.py
 orangecontrib/AAIT/utils/initialize_from_ini.py
+orangecontrib/AAIT/utils/mac_utils.py
 orangecontrib/AAIT/utils/shared_functions.py
 orangecontrib/AAIT/utils/shared_variables.py
 orangecontrib/AAIT/utils/subprocess_management.py
@@ -102,6 +89,7 @@ orangecontrib/AAIT/widgets/OWLLM4ALL.py
 orangecontrib/AAIT/widgets/OWLMStudio.py
 orangecontrib/AAIT/widgets/OWLanguageDetection.py
 orangecontrib/AAIT/widgets/OWLemmatizer.py
+orangecontrib/AAIT/widgets/OWModel_CE_MiniLML6.py
 orangecontrib/AAIT/widgets/OWModel_Falcon.py
 orangecontrib/AAIT/widgets/OWModel_HelsinkiEnFr.py
 orangecontrib/AAIT/widgets/OWModel_HelsinkiFrEn.py
@@ -109,6 +97,7 @@ orangecontrib/AAIT/widgets/OWModel_MPNET.py
 orangecontrib/AAIT/widgets/OWModel_Mistral.py
 orangecontrib/AAIT/widgets/OWModel_Qwen.py
 orangecontrib/AAIT/widgets/OWModel_Qwen1B5_Q6.py
+orangecontrib/AAIT/widgets/OWModel_Qwen2_5_32B.py
 orangecontrib/AAIT/widgets/OWModel_Qwen3B_Q4.py
 orangecontrib/AAIT/widgets/OWModel_Qwen7B_Q4.py
 orangecontrib/AAIT/widgets/OWModel_Qwen7B_Q6.py
@@ -123,6 +112,7 @@ orangecontrib/AAIT/widgets/OWPaddleOCR.py
 orangecontrib/AAIT/widgets/OWProcessDocumentsFromPath.py
 orangecontrib/AAIT/widgets/OWQueryLLM.py
 orangecontrib/AAIT/widgets/OWRandomData.py
+orangecontrib/AAIT/widgets/OWReranking.py
 orangecontrib/AAIT/widgets/OWSaveFilepathEntry.py
 orangecontrib/AAIT/widgets/OWStartLoop.py
 orangecontrib/AAIT/widgets/OWTable2Corpus.py
@@ -149,6 +139,7 @@ orangecontrib/AAIT/widgets/designer/owlangdetect.ui
 orangecontrib/AAIT/widgets/designer/owlemmatizer.ui
 orangecontrib/AAIT/widgets/designer/owllm4all.ui
 orangecontrib/AAIT/widgets/designer/owloadworkflow.ui
+orangecontrib/AAIT/widgets/designer/owmodel_ce_minilml6.ui
 orangecontrib/AAIT/widgets/designer/owmodel_falcon.ui
 orangecontrib/AAIT/widgets/designer/owmodel_helsinki_en_fr.ui
 orangecontrib/AAIT/widgets/designer/owmodel_helsinki_fr_en.ui
@@ -163,6 +154,7 @@ orangecontrib/AAIT/widgets/designer/ownumberpointinrules.ui
 orangecontrib/AAIT/widgets/designer/owpaddleocr.ui
 orangecontrib/AAIT/widgets/designer/owprocessdocuments.ui
 orangecontrib/AAIT/widgets/designer/owqueryllm.ui
+orangecontrib/AAIT/widgets/designer/owreranking.ui
 orangecontrib/AAIT/widgets/designer/owstartloop.ui
 orangecontrib/AAIT/widgets/designer/owtable2corpus.ui
 orangecontrib/AAIT/widgets/designer/owtranslation.ui
@@ -178,6 +170,7 @@ orangecontrib/AAIT/widgets/icons/documents.png
 orangecontrib/AAIT/widgets/icons/endloop.png
 orangecontrib/AAIT/widgets/icons/extra_chunks.png
 orangecontrib/AAIT/widgets/icons/in_or_out.png
+orangecontrib/AAIT/widgets/icons/input.png
 orangecontrib/AAIT/widgets/icons/keyword.png
 orangecontrib/AAIT/widgets/icons/languages.png
 orangecontrib/AAIT/widgets/icons/llm4all.svg
@@ -190,7 +183,10 @@ orangecontrib/AAIT/widgets/icons/local_interf_text_pull.svg
 orangecontrib/AAIT/widgets/icons/logo_solar.svg
 orangecontrib/AAIT/widgets/icons/logo_uncensoredsolar.svg
 orangecontrib/AAIT/widgets/icons/logo_upload.png
+orangecontrib/AAIT/widgets/icons/models.png
 orangecontrib/AAIT/widgets/icons/optimisation.png
+orangecontrib/AAIT/widgets/icons/optimizer.png
+orangecontrib/AAIT/widgets/icons/output.png
 orangecontrib/AAIT/widgets/icons/owCN2_intersect_rules.svg
 orangecontrib/AAIT/widgets/icons/owchunking.png
 orangecontrib/AAIT/widgets/icons/owconversellm.svg
@@ -201,6 +197,7 @@ orangecontrib/AAIT/widgets/icons/owfilewithpath.svg
 orangecontrib/AAIT/widgets/icons/owgeneratequestions.svg
 orangecontrib/AAIT/widgets/icons/owgeneratesynthesis.png
 orangecontrib/AAIT/widgets/icons/owlemmatizer.svg
+orangecontrib/AAIT/widgets/icons/owmodel_ce_minilml6.svg
 orangecontrib/AAIT/widgets/icons/owmodel_falcon.png
 orangecontrib/AAIT/widgets/icons/owmodel_helsinki_en_fr.svg
 orangecontrib/AAIT/widgets/icons/owmodel_helsinki_fr_en.svg
@@ -210,6 +207,7 @@ orangecontrib/AAIT/widgets/icons/owmodel_spacymd_fr.svg
 orangecontrib/AAIT/widgets/icons/owoptimisation.svg
 orangecontrib/AAIT/widgets/icons/owoptimisationselection.png
 orangecontrib/AAIT/widgets/icons/owqueryllm.svg
+orangecontrib/AAIT/widgets/icons/owreranking.svg
 orangecontrib/AAIT/widgets/icons/owsavefilepathentry.svg
 orangecontrib/AAIT/widgets/icons/owtable2corpus.svg
 orangecontrib/AAIT/widgets/icons/owtranslation.svg
@@ -218,16 +216,5 @@ orangecontrib/AAIT/widgets/icons/paddleocr.svg
 orangecontrib/AAIT/widgets/icons/processdocuments.svg
 orangecontrib/AAIT/widgets/icons/qwen-color.png
 orangecontrib/AAIT/widgets/icons/startloop.png
-orangecontrib/AAIT/widgets/icons/widgetFactory.svg
-orangecontrib/IMG4IT/__init__.py
-orangecontrib/IMG4IT/utils/__init__.py
-tests/test_class_values_context_handler.py
-tests/test_credentials.py
-tests/test_domain_context_handler.py
-tests/test_gui.py
-tests/test_matplotlib_export.py
-tests/test_perfect_domain_context_handler.py
-tests/test_scatterplot_density.py
-tests/test_settings_handler.py
-tests/test_widgets_outputs.py
-tests/test_workflows.py
+orangecontrib/AAIT/widgets/icons/tools.png
+orangecontrib/AAIT/widgets/icons/widgetFactory.svg

{aait-1.0.4.2 → aait-1.0.5}/orangecontrib/AAIT/utils/MetManagement.py

@@ -528,7 +528,8 @@ def set_aait_store_remote_ressources_path(ressource_path):
         print("current remote version", version)
     except:
         SimpleDialogQt.BoxError(ressource_path+ " is not a valid remote ressource path")
-        raise Exception(ressource_path+ " is not a valid remote ressource path")
+        print(ressource_path+ " is not a valid remote ressource path")
+        return
     store_ia_path = get_local_store_path()
     # writinf local file with directory path
     try:
@@ -856,6 +857,10 @@ def download_aait_store_file_or_directory(server_path: str = "", target: str = "
                     output=str(Path(output).resolve().parent).replace('\\','/')+"/"
                 windows_utils.win32_shellcopy(source, output)
             else:
+                #try:
+                #    windows_utils.mac_shellcopy(source, output)
+                #except Exception as e:
+                    #print(e)
                 try:
                     dialog_progress = SimpleDialogQt.ProgressDialog(
                         title="Synchronsation please wait",
@@ -1335,7 +1340,10 @@ def get_path_linkHTMLWorkflow():
 
 def get_path_mailFolder():
     aait_path = get_local_store_path()
-    return aait_path + "exchangeMail/"
+    the_path= aait_path + "exchangeMail/"
+    if not os.path.exists(the_path):
+        os.makedirs(the_path)
+    return the_path
 
 def get_secret_content_dir():
     aait_path = get_local_store_path()

aait-1.0.5/orangecontrib/AAIT/utils/mac_utils.py

@@ -0,0 +1,110 @@
+import subprocess
+import os
+import sys
+
+if "site-packages/Orange/widgets" in os.path.dirname(os.path.abspath(__file__)).replace("\\","/"):
+    from Orange.widgets.orangecontrib.AAIT.utils import SimpleDialogQt
+else:
+    from orangecontrib.AAIT.utils import SimpleDialogQt
+
+def mac_shellcopy(src, dest):
+    """
+    Copie des fichiers sur macOS avec gestion des timeouts pour Google Drive.
+
+    :param src: Chemin source (str ou liste de str)
+    :param dest: Chemin de destination (str)
+    :returns: True si succès, False sinon
+    """
+    import io
+    from tqdm import tqdm
+
+    BUFFER_SIZE = 10 * 1024 * 1024  # 10MB buffer
+
+    if isinstance(src, str):
+        src = [src]
+
+    src = [os.path.abspath(s) for s in src]
+    dest = os.path.abspath(dest)
+
+    def copy_file_with_retries(source_path, dest_path, max_retries=3):
+        if not os.path.exists(source_path):
+            print(f"Erreur : fichier source introuvable : {source_path}")
+            return False
+
+        # Créer le dossier de destination
+        os.makedirs(os.path.dirname(dest_path), exist_ok=True)
+
+        # Obtenir la taille du fichier
+        try:
+            file_size = os.path.getsize(source_path)
+        except OSError:
+            print(f"Impossible d'obtenir la taille du fichier : {source_path}")
+            return False
+
+        for attempt in range(max_retries):
+            try:
+                with open(source_path, 'rb') as source, \
+                        open(dest_path, 'wb') as target, \
+                        tqdm(total=file_size, unit='B', unit_scale=True,
+                             desc=f"Copie de {os.path.basename(source_path)}") as pbar:
+
+                    while True:
+                        buf = source.read(BUFFER_SIZE)
+                        if not buf:
+                            break
+                        target.write(buf)
+                        pbar.update(len(buf))
+
+                # Vérifier que la copie est complète
+                if os.path.getsize(dest_path) == file_size:
+                    return True
+                else:
+                    print(
+                        f"Erreur : taille du fichier incorrecte après la copie, tentative {attempt + 1}/{max_retries}")
+                    continue
+
+            except IOError as e:
+                if e.errno == 60:  # Operation timed out
+                    print(f"Timeout lors de la copie, tentative {attempt + 1}/{max_retries}")
+                    # Supprimer le fichier partiellement copié
+                    try:
+                        if os.path.exists(dest_path):
+                            os.remove(dest_path)
+                    except:
+                        pass
+                    if attempt < max_retries - 1:
+                        continue
+                print(f"Erreur lors de la copie : {e}")
+                return False
+            except Exception as e:
+                print(f"Erreur inattendue : {e}")
+                return False
+
+        return False
+
+    try:
+        for s in src:
+            filename = os.path.basename(s)
+            destination_path = os.path.join(dest, filename)
+
+            # Notification de début
+            os.system(
+                f'''osascript -e 'display notification "Début de la copie de {filename}" with title "Copie de fichier"' ''')
+
+            success = copy_file_with_retries(s, destination_path)
+
+            if not success:
+                # Notification d'échec
+                os.system(
+                    f'''osascript -e 'display notification "Échec de la copie de {filename}" with title "Erreur de copie"' ''')
+                return False
+
+            # Notification de succès
+            os.system(
+                f'''osascript -e 'display notification "Copie terminée de {filename}" with title "Copie réussie"' ''')
+
+        return True
+
+    except Exception as e:
+        print(f"Erreur globale : {e}")
+        return False

{aait-1.0.4.2 → aait-1.0.5}/orangecontrib/AAIT/utils/windows_utils.py

@@ -331,3 +331,169 @@ if os.name=='nt':
                 return ""
         else:
             return parts[0] if parts else ""
+
+
+
+
+def select_new_file_ctypes(file_filter="All Files (*.*)"):
+    """
+    Opens a native Windows file dialog for creating a new file.
+
+    Args:
+        file_filter (str): File type filters, e.g., "Text Files (*.txt)" or "All Files (*.*)".
+
+    Returns:
+        str: Selected file path as a string, or an empty string if cancelled.
+    """
+    OFN_EXPLORER = 0x00080000
+    MAX_PATH = 65536  # Large buffer for filename
+
+    class OPENFILENAME(ctypes.Structure):
+        _fields_ = [
+            ("lStructSize", ctypes.wintypes.DWORD),
+            ("hwndOwner", ctypes.wintypes.HWND),
+            ("hInstance", ctypes.wintypes.HINSTANCE),
+            ("lpstrFilter", ctypes.c_wchar_p),
+            ("lpstrCustomFilter", ctypes.c_wchar_p),
+            ("nMaxCustFilter", ctypes.wintypes.DWORD),
+            ("nFilterIndex", ctypes.wintypes.DWORD),
+            ("lpstrFile", ctypes.c_wchar_p),
+            ("nMaxFile", ctypes.wintypes.DWORD),
+            ("lpstrFileTitle", ctypes.c_wchar_p),
+            ("nMaxFileTitle", ctypes.wintypes.DWORD),
+            ("lpstrInitialDir", ctypes.c_wchar_p),
+            ("lpstrTitle", ctypes.c_wchar_p),
+            ("Flags", ctypes.wintypes.DWORD),
+            ("nFileOffset", ctypes.wintypes.WORD),
+            ("nFileExtension", ctypes.wintypes.WORD),
+            ("lpstrDefExt", ctypes.c_wchar_p),
+            ("lCustData", ctypes.wintypes.LPARAM),
+            ("lpfnHook", ctypes.c_void_p),
+            ("lpTemplateName", ctypes.c_wchar_p),
+            ("pvReserved", ctypes.c_void_p),
+            ("dwReserved", ctypes.wintypes.DWORD),
+            ("FlagsEx", ctypes.wintypes.DWORD),
+        ]
+
+    user32 = ctypes.windll.user32
+    comdlg32 = ctypes.windll.comdlg32
+
+    # Convert file_filter into Windows format: "Description\0Pattern\0..."
+    if "(" in file_filter and ")" in file_filter:
+        description = file_filter.split("(")[0].strip()
+        pattern = file_filter[file_filter.find("(")+1:file_filter.find(")")]
+    else:
+        description = "All Files"
+        pattern = "*.*"
+
+    # Extract first extension for default
+    first_ext = pattern.split(";")[0].strip().lstrip("*.")
+    if not first_ext:
+        first_ext = "txt"
+
+    filter_combined = f"{description}\0{pattern}\0All Files\0*.*\0\0"
+
+    file_buffer = ctypes.create_unicode_buffer(MAX_PATH)
+
+    ofn = OPENFILENAME()
+    ofn.lStructSize = ctypes.sizeof(OPENFILENAME)
+    ofn.hwndOwner = 0
+    ofn.lpstrFilter = filter_combined
+    ofn.lpstrFile = ctypes.cast(file_buffer, ctypes.c_wchar_p)
+    ofn.nMaxFile = MAX_PATH
+    ofn.lpstrTitle = "Create New File"
+    ofn.Flags = OFN_EXPLORER
+    ofn.lpstrDefExt = first_ext  # <- extension ajoutée automatiquement si absente
+
+    # Mémoriser les fenêtres existantes
+    hwnd_list_before = []
+    def enum_windows_proc(hwnd, lParam):
+        hwnd_list_before.append(hwnd)
+        return True
+
+    EnumWindows = user32.EnumWindows
+    EnumWindowsProc = ctypes.WINFUNCTYPE(ctypes.wintypes.BOOL, ctypes.wintypes.HWND, ctypes.wintypes.LPARAM)
+    EnumWindows(EnumWindowsProc(enum_windows_proc), 0)
+
+    # Ouvre la boîte de dialogue
+    if not comdlg32.GetSaveFileNameW(ctypes.byref(ofn)):
+        return ""
+
+    time.sleep(0.1)
+
+    # Fenêtres après
+    hwnd_list_after = []
+    EnumWindows(EnumWindowsProc(lambda hwnd, lParam: hwnd_list_after.append(hwnd) or True), 0)
+    new_hwnds = list(set(hwnd_list_after) - set(hwnd_list_before))
+
+    selector_hwnd = None
+    for hwnd in new_hwnds:
+        length = user32.GetWindowTextLengthW(hwnd)
+        if length > 0:
+            title = ctypes.create_unicode_buffer(length + 1)
+            user32.GetWindowTextW(hwnd, title, length + 1)
+            if "Save" in title.value:
+                selector_hwnd = hwnd
+                break
+
+    def enforce_modal(hwnd):
+        if not hwnd:
+            return
+        while user32.IsWindow(hwnd):
+            user32.SetForegroundWindow(hwnd)
+            user32.SetWindowPos(hwnd, -1, 0, 0, 0, 0,
+                                0x0002 | 0x0001 | 0x0040)  # SWP_NOMOVE | SWP_NOSIZE | SWP_SHOWWINDOW
+            time.sleep(0.2)
+
+    if selector_hwnd:
+        threading.Thread(target=enforce_modal, args=(selector_hwnd,), daemon=True).start()
+
+    result = ctypes.wstring_at(ctypes.addressof(file_buffer), file_buffer._length_)
+    return result.split('\0', 1)[0].replace("\\", "/")
+
+
+
+import subprocess
+import os
+import sys
+
+def mac_shellcopy(src, dest):
+    """
+    Copy files or directories on macOS using AppleScript to show a native progress dialog.
+    :param src: Path to source file or directory (str or list of str)
+    :param dest: Path to destination directory (str)
+    :returns: True if successful, False otherwise
+    """
+    if isinstance(src, str):
+        src = [src]
+    src = [os.path.abspath(s) for s in src]
+    dest = os.path.abspath(dest)
+
+    # AppleScript for copying with progress dialog
+    script = f'''
+    set srcList to {{{", ".join([f'POSIX file "{s}"' for s in src])}}}
+    set destFolder to POSIX file "{dest}"
+    tell application "Finder"
+        repeat with aSrc in srcList
+            duplicate aSrc to destFolder with replacing
+        end repeat
+    end tell
+    '''
+
+    try:
+        result = subprocess.run(
+            ['osascript', '-e', script],
+            capture_output=True,
+            text=True
+        )
+        if result.returncode == 0:
+            return True
+        else:
+            print("AppleScript error:", result.stderr)
+            return False
+    except Exception as e:
+        print("Error:", e)
+        return False
+
+# Usage:
+# mac_shellcopy("/path/to/source", "/path/to/destination")

{aait-1.0.4.2 → aait-1.0.5}/orangecontrib/AAIT/widgets/OWAAITResourcesManager.py

@@ -349,13 +349,20 @@ class OWAAITResourcesManager(widget.OWWidget):
             descriptions[name] = element["description"][0]
 
         self.descriptions = descriptions
+        print(self.descriptions)
         self.comboBox.addItems(workflows)
 
+        if workflows:
+            self.handleComboBoxChange(0)
+
     def handleComboBoxChange(self, index):
         selected_file = self.comboBox.itemText(index)
-        if selected_file=="":
+        if selected_file == "":
+            self.label_info.setText("")
             return
-       
+        # Set the label to the description
+        description = self.descriptions.get(selected_file, "")
+        self.label_info.setText(description)
 
     def read_description(self, file_name):
         # Chemin du fichier texte contenant la description
@@ -367,6 +374,7 @@ class OWAAITResourcesManager(widget.OWWidget):
                 description = file.read()
         else:
             description = ""
+        print("alllloooo: ", description)
         return description
 
     def saveFile(self):

{aait-1.0.4.2 → aait-1.0.5}/orangecontrib/AAIT/widgets/OWApplyRules.py

@@ -4,9 +4,10 @@ import re
 import Orange.data
 from Orange.widgets import widget
 from Orange.widgets.widget import Input, Output
-from Orange.data import Table, Domain,  DiscreteVariable
+from Orange.data import Table, Domain, DiscreteVariable
 from AnyQt.QtWidgets import QPushButton, QCheckBox
 from Orange.widgets.settings import Setting
+
 # from fontTools.varLib.mutator import curr
 
 if "site-packages/Orange/widgets" in os.path.dirname(os.path.abspath(__file__)).replace("\\", "/"):
@@ -16,6 +17,7 @@ else:
     from orangecontrib.AAIT.utils.import_uic import uic
     from orangecontrib.AAIT.utils.initialize_from_ini import apply_modification_from_python_file
 
+
 @apply_modification_from_python_file(filepath_original_widget=__file__)
 class OWApplyRules(widget.OWWidget):
     name = "Apply Rules to data"
@@ -27,6 +29,7 @@ class OWApplyRules(widget.OWWidget):
     keywords = "Apply Rules to data"
     gui = os.path.join(os.path.dirname(os.path.abspath(__file__)), "designer/owapplyrules.ui")
     want_control_area = False
+
     class Inputs:
         rules = Input("Rules", Orange.data.Table)
         data = Input("Data", Orange.data.Table)
@@ -36,7 +39,6 @@ class OWApplyRules(widget.OWWidget):
 
     strauto: str = Setting('False')
 
-
     @Inputs.rules
     def set_rules(self, data):
         self.rules_data = data
@@ -70,7 +72,6 @@ class OWApplyRules(widget.OWWidget):
         self.btn_run = self.findChild(QPushButton, "pushButton")
         self.btn_run.clicked.connect(self.run)
 
-
         self.checkbox_interface = self.findChild(QCheckBox, 'checkBox')
         if self.strauto == 'Middle':
             self.strauto = 'False'
@@ -95,7 +96,14 @@ class OWApplyRules(widget.OWWidget):
             text_to_edit = text_to_edit[:-1]
         return text_to_edit
 
+    def normalize_rule(self, unit_rule):
+        unit_rule = re.sub(r'(?<!>)>(?!=)', '>=', unit_rule)
+        unit_rule = re.sub(r'(?<!<)<(?!=)', '<=', unit_rule)
+        return unit_rule
 
+    def needs_normalization(self, unit_rule):
+        # Vérifie s'il y a un > non suivi de =, ou un < non suivi de =
+        return bool(re.search(r'(?<!>)>(?!=)|(?<!<)<(?!=)', unit_rule))
 
     def run(self):
         self.error("")
@@ -104,8 +112,6 @@ class OWApplyRules(widget.OWWidget):
             self.error("You must have rules and data")
             return
 
-
-
         data_regle = self.rules_data
         data_value = self.data
         num_col_regle = data_regle.domain.index("regle")
@@ -120,34 +126,36 @@ class OWApplyRules(widget.OWWidget):
 
             ## cette partie permet de gérer le cas ou dans une règle une variable n'est pas présente dans les données d'entrées et de pas avoir une erreur
             regl_list = str(current_regle).split(" and ")
-            compteur=0
+            compteur = 0
             for unit_rule in regl_list:
-                compteur=compteur+1
+                compteur = compteur + 1
+                if self.needs_normalization(unit_rule) and "->" not in unit_rule:
+                    unit_rule = self.normalize_rule(unit_rule)
                 current_var, current_symb, current_value = re.split(r'(<=|>=)', unit_rule)
                 current_var = self.del_space_debut_fin(current_var)
                 if current_var not in data_value.domain:
                     var_not_in_domain.append(current_var)
-                    if compteur!=1:
-                        current_var="and "+ current_var
-                    value_in_rule_not_in_domain.append(current_var +" "+ current_symb + current_value)
+                    if compteur != 1:
+                        current_var = "and " + current_var
+                    value_in_rule_not_in_domain.append(current_var + " " + current_symb + current_value)
             if len(var_not_in_domain) > 0:
                 self.warning("Warning " + ",".join(var_not_in_domain) + " not in possible variable")
 
-                for j,element in enumerate(value_in_rule_not_in_domain):
+                for j, element in enumerate(value_in_rule_not_in_domain):
                     current_regle = str(current_regle).replace(element, "")
 
             # if current rules start with "     and " we need to remove the begin of the rule
-            test_current_regle=str(current_regle)
+            test_current_regle = str(current_regle)
             # print("#####")
             # print(test_current_regle)
             # print(type(test_current_regle))
             # print("##########################")
-            while(test_current_regle[0]==" "):
-                test_current_regle=test_current_regle[1:]
-            if len(test_current_regle)>=4:
-                if test_current_regle[:4]=="and ":
-                    test_current_regle=test_current_regle[4:]
-                    current_regle=test_current_regle
+            while (test_current_regle[0] == " "):
+                test_current_regle = test_current_regle[1:]
+            if len(test_current_regle) >= 4:
+                if test_current_regle[:4] == "and ":
+                    test_current_regle = test_current_regle[4:]
+                    current_regle = test_current_regle
                     print(current_regle)
             for i in range(len(data_value)):
                 new_regle = str(current_regle)
@@ -196,15 +204,17 @@ class OWApplyRules(widget.OWWidget):
 
     def on_checkbox_toggled(self, state):
         if state == 2:  # Qt.Checked (valeur 2 pour "coché")
-            self.strauto='True'
+            self.strauto = 'True'
         elif state == 0:  # Qt.Unchecked (valeur 0 pour "décoché")
-            self.strauto='False'
-        elif state==1:
+            self.strauto = 'False'
+        elif state == 1:
             self.strauto = 'Middle'
 
+
 if __name__ == "__main__":
     from AnyQt.QtWidgets import QApplication
+
     app = QApplication(sys.argv)
     my_widget = OWApplyRules()
     my_widget.show()
-    app.exec_()
+    app.exec_()