aait 2.2.0__tar.gz → 2.2.2__tar.gz

{aait-2.2.0 → aait-2.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aait
-Version: 2.2.0
+Version: 2.2.2
 Summary: Advanced Artificial Intelligence Tools is a package meant to develop and enable advanced AI functionalities in Orange
 Home-page: 
 Author: Orange community

{aait-2.2.0 → aait-2.2.2}/aait.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aait
-Version: 2.2.0
+Version: 2.2.2
 Summary: Advanced Artificial Intelligence Tools is a package meant to develop and enable advanced AI functionalities in Orange
 Home-page: 
 Author: Orange community

{aait-2.2.0 → aait-2.2.2}/orangecontrib/AAIT/utils/windows_utils.py

@@ -54,7 +54,7 @@ if os.name=='nt':
 
         return not aborted
 
-    def select_folder_ctypes():
+    def select_folder_ctypes(title="Select a directory"):
         """
         Opens a native Windows folder selection dialog with enforced modal-like behavior, without attaching to any parent window.
 
@@ -124,7 +124,7 @@ if os.name=='nt':
         browse_info.hwndOwner = 0
         browse_info.pidlRoot = None
         browse_info.pszDisplayName = ctypes.cast(display_name_buffer, ctypes.c_wchar_p)
-        browse_info.lpszTitle = "Select a directory"
+        browse_info.lpszTitle = title
         browse_info.ulFlags = BIF_RETURNONLYFSDIRS | BIF_NEWDIALOGSTYLE
         browse_info.lpfn = None
         browse_info.lParam = None
@@ -198,7 +198,7 @@ if os.name=='nt':
     import ctypes.wintypes
 
 
-    def select_file_ctypes(multi_select=False, file_filter="All Files (*.*)"):
+    def select_file_ctypes(multi_select=False, file_filter="All Files (*.*)", dialog_title="Select File(s)"):
         """
         Opens a native Windows file selection dialog with enforced modal-like behavior.
 
@@ -262,7 +262,7 @@ if os.name=='nt':
         ofn.lpstrFilter = filter_combined
         ofn.lpstrFile = ctypes.cast(file_buffer, ctypes.c_wchar_p)
         ofn.nMaxFile = MAX_PATH
-        ofn.lpstrTitle = "Select File(s)"
+        ofn.lpstrTitle = dialog_title
         ofn.Flags = OFN_EXPLORER | OFN_FILEMUSTEXIST
         if multi_select:
             ofn.Flags |= OFN_ALLOWMULTISELECT
@@ -291,12 +291,13 @@ if os.name=='nt':
         new_hwnds = list(set(hwnd_list_after) - set(hwnd_list_before))
 
         selector_hwnd = None
+        target_phrase = (dialog_title or "Select").lower()
         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 "Select" in title.value:
+                window_title = ctypes.create_unicode_buffer(length + 1)
+                user32.GetWindowTextW(hwnd, window_title, length + 1)
+                if target_phrase in window_title.value.lower():
                     selector_hwnd = hwnd
                     break
 
@@ -335,7 +336,7 @@ if os.name=='nt':
 
 
 
-def select_new_file_ctypes(file_filter="All Files (*.*)"):
+def select_new_file_ctypes(file_filter="All Files (*.*)", dialog_title="Create New File"):
     """
     Opens a native Windows file dialog for creating a new file.
 
@@ -401,7 +402,7 @@ def select_new_file_ctypes(file_filter="All Files (*.*)"):
     ofn.lpstrFilter = filter_combined
     ofn.lpstrFile = ctypes.cast(file_buffer, ctypes.c_wchar_p)
     ofn.nMaxFile = MAX_PATH
-    ofn.lpstrTitle = "Create New File"
+    ofn.lpstrTitle = dialog_title
     ofn.Flags = OFN_EXPLORER
     ofn.lpstrDefExt = first_ext  # <- extension ajoutée automatiquement si absente
 
@@ -427,12 +428,13 @@ def select_new_file_ctypes(file_filter="All Files (*.*)"):
     new_hwnds = list(set(hwnd_list_after) - set(hwnd_list_before))
 
     selector_hwnd = None
+    target_phrase = (dialog_title or "Save").lower()
     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:
+            window_title = ctypes.create_unicode_buffer(length + 1)
+            user32.GetWindowTextW(hwnd, window_title, length + 1)
+            if target_phrase in window_title.value.lower():
                 selector_hwnd = hwnd
                 break
 

{aait-2.2.0 → aait-2.2.2}/orangecontrib/AAIT/widgets/OWFusionNM.py

@@ -368,8 +368,19 @@ class OWFusionNN(widget.OWWidget):
                 Y_out = np.full((n_rows,), np.nan)
             else:
                 Y_out = np.full((n_rows, len(out_classes)), np.nan)
-            M_out = np.empty((n_rows, len(out_metas)), dtype=object)
-            M_out[:] = np.nan
+            M_out = np.full((n_rows, len(out_metas)), None, dtype=object)
+            def normalize_meta_value(value):
+                if value is None:
+                    return None
+                if isinstance(value, (float, np.floating)):
+                    if np.isnan(value):
+                        return None
+                try:
+                    if value != value:
+                        return None
+                except Exception:
+                    pass
+                return value
 
             # Helpers d'accès aux valeurs source
             def get_class_val(table: Orange.data.Table, row: int, idx: int):
@@ -405,7 +416,8 @@ class OWFusionNN(widget.OWWidget):
                     if s != side:
                         continue
                     if src_table.metas.shape[1] > idx:
-                        M_out[out_row, pos] = src_table.metas[src_row, idx]
+                        raw_value = src_table.metas[src_row, idx]
+                        M_out[out_row, pos] = normalize_meta_value(raw_value)
 
             # Remplir lignes: appariées, puis A-only, puis B-only
             r = 0

{aait-2.2.0 → aait-2.2.2}/orangecontrib/AAIT/widgets/OWGenerateWord.py

@@ -139,13 +139,10 @@ class OWDocumentGenerator(widget.OWWidget):
     @Inputs.tables
     def set_table(self, index, data):
         """Tables à insérer - le nom de la connexion = balise cible"""
-        print(index)
         if data is not None:
             # Essayer de récupérer le nom de la table depuis les métadonnées
             table_name = self.get_table_name(data, index)
             self.tables_dict[table_name] = data
-            print(self.tables_dict)
-            print(f"Table '{table_name}' connectée")
         self.check_and_run()
 
     @Inputs.tables.insert
@@ -155,8 +152,6 @@ class OWDocumentGenerator(widget.OWWidget):
         if data is not None:
             table_name = self.get_table_name(data, index)
             self.tables_dict[table_name] = data
-            print(self.tables_dict)
-            print(f"Table '{table_name}' ajoutée")
         self.check_and_run()
 
     @Inputs.tables.remove
@@ -164,7 +159,6 @@ class OWDocumentGenerator(widget.OWWidget):
         """Gère la suppression d'une table"""
         # Trouver et supprimer la table correspondante
         key=list(self.tables_dict.keys())
-        print(" la table a supprimer:",self.tables_dict[key[index]])
         del self.tables_dict[key[index]]
         self.check_and_run()
 
@@ -198,7 +192,6 @@ class OWDocumentGenerator(widget.OWWidget):
         """Méthode principale de traitement"""
         self.error("")
         self.warning("")
-        print("")
 
         try:
             # 1. Charger le template
@@ -208,7 +201,6 @@ class OWDocumentGenerator(widget.OWWidget):
                 return
 
             self.doc = Document(template_path)
-            print(f"Template chargé : {os.path.basename(template_path)}")
 
             # 2. Effectuer les remplacements de texte
             if self.replacements_table is not None:
@@ -224,7 +216,6 @@ class OWDocumentGenerator(widget.OWWidget):
             # 5. Envoyer le résultat
             self.send_result(output_path)
 
-            print(f"✅ Document généré : {os.path.basename(output_path)}")
 
         except Exception as e:
             self.error(f"Erreur : {str(e)}")
@@ -322,7 +313,6 @@ class OWDocumentGenerator(widget.OWWidget):
             self.replace_text_in_doc(target, value)
             count += 1
 
-        print(f"✓ {count} remplacements de texte effectués")
 
     def replace_text_in_doc(self, placeholder: str, value: str):
         """Remplace du texte dans tout le document"""
@@ -387,11 +377,8 @@ class OWDocumentGenerator(widget.OWWidget):
 
             if self.insert_table_in_doc(target, table_data):
                 count += 1  # Compteur pour l'app
-                print(f"✓ Table insérée à la position {target}")
 
-        if count > 0:
-            print("✓ ", count, "tableaux insérés")
-            print(f"✓ {count} tableaux insérés")
+
 
     def insert_table_in_doc(self, tag: str, table_data: Table) -> bool:
         """Insère un tableau dans le document"""
@@ -534,6 +521,7 @@ class OWDocumentGenerator(widget.OWWidget):
         rFonts.set(qn('w:hAnsi'), self.default_font)
 
 
+
     def save_document(self) -> str:
         """Sauvegarde le document"""
         output_name = "output.docx"
@@ -544,12 +532,12 @@ class OWDocumentGenerator(widget.OWWidget):
 
             # Chercher Output_Name
             for attr in self.paths_table.domain.attributes:
-                if attr.name == "Output_Name":
+                if attr.name == "Output_Path":
                     output_name = str(row[attr])
                     break
             else:
                 for i, meta in enumerate(self.paths_table.domain.metas):
-                    if meta.name == "Output_Name":
+                    if meta.name == "Output_Path":
                         output_name = str(self.paths_table.metas[0, i])
                         break
 

{aait-2.2.0 → aait-2.2.2}/orangecontrib/AAIT/widgets/OWInputSelector.py

@@ -38,6 +38,7 @@ class OWInputSelector(OWWidget):
     new_file:str = Setting("False")
     combo_box_current_text: str=Setting("All (*.*)")
     line_edit_value:str=Setting("")
+    dialog_window_title: str = Setting("")
     def update_qt_view_from_settings(self):
         if str(self.select_folder_radio_button_checked) =="True":
             self.radioButton.setChecked(True)
@@ -45,6 +46,7 @@ class OWInputSelector(OWWidget):
             self.checkBox.hide()
             self.comboBox.hide()
             self.checkBox_new_file.hide()
+            self.update_dialog_title_placeholder()
             return
         self.radioButton.setChecked(False)
         self.radioButton2.setChecked(True)
@@ -70,6 +72,7 @@ class OWInputSelector(OWWidget):
         self.checkBox.show()
         self.comboBox.show()
         self.checkBox_new_file.show()
+        self.update_dialog_title_placeholder()
 
 
     def update_setting_from_qt_view(self):
@@ -107,7 +110,7 @@ class OWInputSelector(OWWidget):
 
 
         self.setFixedWidth(700)
-        self.setFixedHeight(300)
+        self.setFixedHeight(400)
         uic.loadUi(self.gui, self)
         self.radioButton=self.findChild(QRadioButton, 'radioButton')
         self.radioButton2 = self.findChild(QRadioButton, 'radioButton_2')
@@ -117,6 +120,14 @@ class OWInputSelector(OWWidget):
         self.pushButton = self.findChild(QPushButton, 'pushButton')
         self.lineEdit=self.findChild(QLineEdit,'lineEdit')
         self.lineEdit.setText(self.line_edit_value)
+        self.windowTitleEdit = self.findChild(QLineEdit, 'lineEdit_window_title')
+        if self.windowTitleEdit is not None:
+            sanitized_title = (self.dialog_window_title or "").strip()
+            if sanitized_title != self.dialog_window_title:
+                self.dialog_window_title = sanitized_title
+            self.windowTitleEdit.setText(sanitized_title)
+            self.update_dialog_title_placeholder()
+            self.windowTitleEdit.editingFinished.connect(self.update_dialog_title_setting)
 
         # based on the string you can modify orders and add without problem
         file_types = [
@@ -264,6 +275,35 @@ class OWInputSelector(OWWidget):
             self.checkBox_new_file.setEnabled(False)
             self.comboBox.setEnabled(False)
 
+    def update_dialog_title_setting(self):
+        if getattr(self, 'windowTitleEdit', None) is None:
+            return
+        value = self.windowTitleEdit.text().strip()
+        if self.windowTitleEdit.text() != value:
+            self.windowTitleEdit.setText(value)
+        self.dialog_window_title = value
+        self.update_dialog_title_placeholder()
+
+    def get_default_dialog_title(self):
+        if str(self.select_folder_radio_button_checked) == "True":
+            return "Select a directory"
+        if str(self.new_file) == "True":
+            return "Create New File"
+        return "Select File(s)"
+
+    def get_effective_dialog_title(self):
+        default_title = self.get_default_dialog_title()
+        if self.dialog_window_title:
+            value = self.dialog_window_title.strip()
+            if value:
+                return value
+        return default_title
+
+    def update_dialog_title_placeholder(self):
+        if getattr(self, 'windowTitleEdit', None) is None:
+            return
+        self.windowTitleEdit.setPlaceholderText(self.get_default_dialog_title())
+
 
     @Inputs.input_table
     def input_table(self, data):
@@ -279,7 +319,7 @@ class OWInputSelector(OWWidget):
             self.commit_path()
             return
         if str(self.select_folder_radio_button_checked) =="True":
-            self.selected_path=self.select_folder()
+            self.selected_path = self.select_folder(self.get_effective_dialog_title())
             if self.selected_path is None:
                 self.selected_path=""
             if self.selected_path=="":
@@ -290,10 +330,11 @@ class OWInputSelector(OWWidget):
         if str(self.select_multiple_file_checked)!="False":
             multi_select=True
         file_filter=str(self.combo_box_current_text)
+        dialog_title = self.get_effective_dialog_title()
         if str(self.new_file)=="False":
-            self.selected_path=self.select_file(multi_select,file_filter)
+            self.selected_path = self.select_file(multi_select, file_filter, dialog_title)
         else:
-            self.selected_path = self.select_new_file(file_filter)
+            self.selected_path = self.select_new_file(file_filter, dialog_title)
         if self.selected_path is None:
             self.selected_path = ""
         if self.selected_path == "":
@@ -301,42 +342,43 @@ class OWInputSelector(OWWidget):
         self.commit_path()
         return
 
-    def select_file(self,multi_select,file_filtter):
+    def select_file(self, multi_select, file_filter, dialog_title):
         if os.name == 'nt':
-            return windows_utils.select_file_ctypes(multi_select=multi_select, file_filter=file_filtter)
+            return windows_utils.select_file_ctypes(
+                multi_select=multi_select,
+                file_filter=file_filter,
+                dialog_title=dialog_title
+            )
         print("a faire correctement sans qt sur mac (et linux")
         from AnyQt.QtWidgets import QFileDialog
         files, _ = QFileDialog.getOpenFileNames(
             self,  # parent
-            "Sélectionner des fichiers",  # titre de la fenêtre
-            "",  # répertoire initial
-            "Tous les fichiers (*.*)"  # filtre
+            dialog_title,  # window title
+            "",  # initial directory
+            file_filter  # filter
         )
         return files
 
-    def select_new_file(self,file_filtter):
+    def select_new_file(self, file_filter, dialog_title):
         if os.name == 'nt':
-            return windows_utils.select_new_file_ctypes(file_filter=file_filtter)
+            return windows_utils.select_new_file_ctypes(file_filter=file_filter, dialog_title=dialog_title)
         print("a faire correctement sans qt sur mac (et linux")
         from AnyQt.QtWidgets import QFileDialog
         files, _ = QFileDialog.getSaveFileName(
             self,  # parent
-            "Créer un fichier",  # titre de la fenêtre
-            "",  # répertoire initial
-            "Tous les fichiers (*.*)"  # filtre
+            dialog_title,  # window title
+            "",  # initial directory
+            file_filter  # filter
         )
         return str(files)
 
-
-
-
-    def select_folder(self):
+    def select_folder(self, dialog_title):
         if os.name=='nt':
-            return windows_utils.select_folder_ctypes()
+            return windows_utils.select_folder_ctypes(title=dialog_title)
         # a faire correctement sans qt sur mac
         print("a faire correctement sans qt sur mac (et linux")
         from AnyQt.QtWidgets import QFileDialog
-        return QFileDialog.getExistingDirectory(self, "Sélectionner un dossier")
+        return QFileDialog.getExistingDirectory(self, dialog_title)
 
     def commit_path(self):
         self.error("")

{aait-2.2.0 → aait-2.2.2}/orangecontrib/AAIT/widgets/designer/ow_in_or_out_path.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>711</width>
-    <height>324</height>
+    <width>717</width>
+    <height>382</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -17,7 +17,7 @@
    <property name="geometry">
     <rect>
      <x>180</x>
-     <y>220</y>
+     <y>270</y>
      <width>501</width>
      <height>51</height>
     </rect>
@@ -30,7 +30,7 @@
    <property name="geometry">
     <rect>
      <x>30</x>
-     <y>190</y>
+     <y>240</y>
      <width>651</width>
      <height>20</height>
     </rect>
@@ -40,7 +40,7 @@
    <property name="geometry">
     <rect>
      <x>20</x>
-     <y>30</y>
+     <y>80</y>
      <width>671</width>
      <height>151</height>
     </rect>
@@ -114,6 +114,29 @@
     </property>
    </widget>
   </widget>
+  <widget class="QLabel" name="label_window_title">
+   <property name="geometry">
+    <rect>
+     <x>20</x>
+     <y>30</y>
+     <width>211</width>
+     <height>16</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>Windows dialog title (optional)</string>
+   </property>
+  </widget>
+  <widget class="QLineEdit" name="lineEdit_window_title">
+   <property name="geometry">
+    <rect>
+     <x>20</x>
+     <y>50</y>
+     <width>651</width>
+     <height>20</height>
+    </rect>
+   </property>
+  </widget>
   <widget class="QCheckBox" name="checkBox_3_send">
    <property name="enabled">
     <bool>false</bool>
@@ -121,7 +144,7 @@
    <property name="geometry">
     <rect>
      <x>20</x>
-     <y>238</y>
+     <y>330</y>
      <width>201</width>
      <height>16</height>
     </rect>

{aait-2.2.0 → aait-2.2.2}/setup.py

@@ -4,7 +4,7 @@ from setuptools import setup, find_packages
 NAME = "aait"
 
 # Version du package PyPI
-VERSION = "2.2.0"  # la version doit être supérieure à la précédente sinon la publication sera refusée
+VERSION = "2.2.2"  # la version doit être supérieure à la précédente sinon la publication sera refusée
 
 # Facultatif / Adaptable à souhait
 AUTHOR = "Orange community"