aait 2.3.14.2__tar.gz → 2.3.15__tar.gz

{aait-2.3.14.2 → aait-2.3.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aait
-Version: 2.3.14.2
+Version: 2.3.15
 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.3.14.2 → aait-2.3.15}/aait.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aait
-Version: 2.3.14.2
+Version: 2.3.15
 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.3.14.2 → aait-2.3.15}/aait.egg-info/SOURCES.txt

@@ -112,7 +112,6 @@ orangecontrib/AAIT/widgets/OWSaveFilepathEntry.py
 orangecontrib/AAIT/widgets/OWSelectColumnDynamique.py
 orangecontrib/AAIT/widgets/OWSelectRowsDynamic.py
 orangecontrib/AAIT/widgets/OWSortAndSelect.py
-orangecontrib/AAIT/widgets/OWSplitExcelSheets.py
 orangecontrib/AAIT/widgets/OWStartLoop.py
 orangecontrib/AAIT/widgets/OWTable2Corpus.py
 orangecontrib/AAIT/widgets/OWTranslation.py

{aait-2.3.14.2 → aait-2.3.15}/orangecontrib/AAIT/llm/answers_llama.py

@@ -413,7 +413,16 @@ def generate_conversation(table, model, conversation=None, n_ctx=32768, query_pa
     conversation.append({"role": "user", "content": user_prompt})
 
     # Generate the answer
-    answer = run_query(prompt, model=model, argself=argself, workflow_id=workflow_id, progress_callback=progress_callback)
+    answer = run_query(prompt,
+                       model=model,
+                       max_tokens=query_parameters["max_tokens"],
+                       temperature=query_parameters["temperature"],
+                       top_p=query_parameters["top_p"],
+                       top_k=query_parameters["top_k"],
+                       repeat_penalty=query_parameters["repeat_penalty"],
+                       workflow_id=workflow_id,
+                       argself=argself,
+                       progress_callback=progress_callback)
 
     # Split the thinking block and remove it from the answer
     think_text, final_answer = split_think(answer=answer)
@@ -511,6 +520,9 @@ def run_Qwen3VL_query(query, image_paths, model, system_prompt=" ", progress_cal
     image_messages = []
     for image_path in image_paths:
         data_uri = convert_to_uri(image_path)
+        if not data_uri.startswith("data"):
+            progress_callback(("error", data_uri))
+            return "The image could not be processed"
         image_messages.append({"type": "image_url", "image_url": {"url": data_uri}})
     image_messages.append({"type": "text", "text": query})
 
@@ -533,11 +545,70 @@ def run_Qwen3VL_query(query, image_paths, model, system_prompt=" ", progress_cal
 
 
 
-def convert_to_uri(image_path):
-    with open(image_path, "rb") as f:
-        image_bytes = f.read()
-    b64_data = base64.b64encode(image_bytes).decode("utf-8")
-    data_uri = f"data:image/png;base64,{b64_data}"
-    return data_uri
+_IMAGE_MIME_TYPES = {
+    # Most common formats
+    '.png':  'image/png',
+    '.jpg':  'image/jpeg',
+    '.jpeg': 'image/jpeg',
+    '.gif':  'image/gif',
+    '.webp': 'image/webp',
+    '.svg':  'image/svg+xml',
+    '.svgz': 'image/svg+xml',
+
+    # Next-generation formats
+    '.avif': 'image/avif',
+    '.heic': 'image/heic',
+    '.heif': 'image/heif',
+    '.heics': 'image/heic-sequence',
+    '.heifs': 'image/heif-sequence',
+
+    # Legacy / Windows formats
+    '.bmp':  'image/bmp',
+    '.dib':  'image/bmp',
+    '.ico':  'image/x-icon',
+    '.cur':  'image/x-icon',
+
+    # Professional imaging
+    '.tif':  'image/tiff',
+    '.tiff': 'image/tiff',
+}
+
+def convert_to_uri(
+    file_path: str,
+    fallback_mime: str = "image/png" #"application/octet-stream"
+) -> str:
+    """
+    Convert a local image file to a base64-encoded data URI with the correct MIME type.
+
+    Supports 20+ image formats (PNG, JPEG, WebP, AVIF, HEIC, SVG, BMP, ICO, TIFF, etc.).
+
+    Args:
+        file_path: Path to the image file on disk.
+        fallback_mime: MIME type used when the file extension is unknown.
+
+    Returns:
+        A valid data URI string (e.g., data:image/webp;base64,...).
+
+    Raises:
+        FileNotFoundError: If the file does not exist.
+        OSError: If reading the file fails.
+    """
+    if not os.path.isfile(file_path):
+        return f"Image file not found: {file_path}"
+
+    extension = os.path.splitext(file_path)[1].lower()
+    mime_type = _IMAGE_MIME_TYPES.get(extension, fallback_mime)
+
+    if mime_type == fallback_mime:
+        print(f"Warning: Unknown extension '{extension}' for '{file_path}'. "
+              f"Using fallback MIME type: {fallback_mime}")
+
+    try:
+        with open(file_path, "rb") as img_file:
+            encoded_data = base64.b64encode(img_file.read()).decode("utf-8")
+    except Exception as e:
+        return f"Failed to read image file '{file_path}': {e}"
+
+    return f"data:{mime_type};base64,{encoded_data}"
 
 

{aait-2.3.14.2 → aait-2.3.15}/orangecontrib/AAIT/utils/MetManagement.py

@@ -1366,7 +1366,7 @@ def get_path_mailFolder():
 
 def get_secret_content_dir():
     aait_path = get_local_store_path()
-    the_path=aait_path+"/keys/"
+    the_path=aait_path+"keys/"
     if not os.path.exists(the_path):
         os.makedirs(the_path)
     return the_path

{aait-2.3.14.2 → aait-2.3.15}/orangecontrib/AAIT/utils/windows_utils.py

@@ -154,54 +154,51 @@ if os.name=='nt':
     import ctypes
     import ctypes.wintypes
 
+    # --- Déclarer UNE SEULE FOIS au niveau module (pas dans la fonction) ---
+    user32 = ctypes.windll.user32
+    comdlg32 = ctypes.windll.comdlg32
 
-    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.
+    EnumWindowsProc = ctypes.WINFUNCTYPE(wt.BOOL, wt.HWND, wt.LPARAM)
 
-        Args:
-            multi_select (bool): Allow selection of multiple files if True.
-            file_filter (str): File type filters, e.g., "Images (*.jpg;*.png;*.jpeg)" or "Documents (*.docx;*.doc)".
+    # Définir la signature de EnumWindows UNE SEULE FOIS
+    user32.EnumWindows.argtypes = (EnumWindowsProc, wt.LPARAM)
+    user32.EnumWindows.restype = wt.BOOL
 
-        Returns:
-            str: Selected file path(s) separated by ';', or an empty string if no selection was made.
-        """
+
+    def select_file_ctypes(multi_select=False, file_filter="All Files (*.*)", dialog_title="Select File(s)"):
         OFN_ALLOWMULTISELECT = 0x00000200
         OFN_EXPLORER = 0x00080000
         OFN_FILEMUSTEXIST = 0x00001000
-        MAX_PATH = 65536  # Large enough for multiple files
+        MAX_PATH = 65536
 
         class OPENFILENAME(ctypes.Structure):
             _fields_ = [
-                ("lStructSize", ctypes.wintypes.DWORD),
-                ("hwndOwner", ctypes.wintypes.HWND),
-                ("hInstance", ctypes.wintypes.HINSTANCE),
+                ("lStructSize", wt.DWORD),
+                ("hwndOwner", wt.HWND),
+                ("hInstance", wt.HINSTANCE),
                 ("lpstrFilter", ctypes.c_wchar_p),
                 ("lpstrCustomFilter", ctypes.c_wchar_p),
-                ("nMaxCustFilter", ctypes.wintypes.DWORD),
-                ("nFilterIndex", ctypes.wintypes.DWORD),
+                ("nMaxCustFilter", wt.DWORD),
+                ("nFilterIndex", wt.DWORD),
                 ("lpstrFile", ctypes.c_wchar_p),
-                ("nMaxFile", ctypes.wintypes.DWORD),
+                ("nMaxFile", wt.DWORD),
                 ("lpstrFileTitle", ctypes.c_wchar_p),
-                ("nMaxFileTitle", ctypes.wintypes.DWORD),
+                ("nMaxFileTitle", wt.DWORD),
                 ("lpstrInitialDir", ctypes.c_wchar_p),
                 ("lpstrTitle", ctypes.c_wchar_p),
-                ("Flags", ctypes.wintypes.DWORD),
-                ("nFileOffset", ctypes.wintypes.WORD),
-                ("nFileExtension", ctypes.wintypes.WORD),
+                ("Flags", wt.DWORD),
+                ("nFileOffset", wt.WORD),
+                ("nFileExtension", wt.WORD),
                 ("lpstrDefExt", ctypes.c_wchar_p),
-                ("lCustData", ctypes.wintypes.LPARAM),
+                ("lCustData", wt.LPARAM),
                 ("lpfnHook", ctypes.c_void_p),
                 ("lpTemplateName", ctypes.c_wchar_p),
                 ("pvReserved", ctypes.c_void_p),
-                ("dwReserved", ctypes.wintypes.DWORD),
-                ("FlagsEx", ctypes.wintypes.DWORD),
+                ("dwReserved", wt.DWORD),
+                ("FlagsEx", wt.DWORD),
             ]
 
-        user32 = ctypes.windll.user32
-        comdlg32 = ctypes.windll.comdlg32
-
-        # Create filter string (must be null-separated and end with double null)
+        # Filter string Windows: \0 séparateurs + double \0 final
         if "(" in file_filter and ")" in file_filter:
             description = file_filter.split("(")[0].strip()
             pattern = file_filter[file_filter.find("(") + 1:file_filter.find(")")]
@@ -210,7 +207,6 @@ if os.name=='nt':
             pattern = "*.*"
         filter_combined = f"{description}\0{pattern}\0All Files\0*.*\0\0"
 
-        # Prepare buffer
         file_buffer = ctypes.create_unicode_buffer(MAX_PATH)
 
         ofn = OPENFILENAME()
@@ -224,68 +220,44 @@ if os.name=='nt':
         if multi_select:
             ofn.Flags |= OFN_ALLOWMULTISELECT
 
-        # Avant ouvrir, mémoriser fenêtres existantes
+        # --- Avant ouverture : liste des HWND ---
         hwnd_list_before = []
 
-        def enum_windows_proc(hwnd, lParam):
+        def _enum_before(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)
+        cb_before = EnumWindowsProc(_enum_before)  # garder une référence !
+        user32.EnumWindows(cb_before, 0)
 
-        # Ouvre la boîte de sélection
+        # --- Ouvre la boîte ---
         if not comdlg32.GetOpenFileNameW(ctypes.byref(ofn)):
-            return ""  # Cancelled
+            return ""
 
         time.sleep(0.1)
 
-        # Après ouverture
+        # --- Après ouverture : liste des HWND ---
         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
-        target_phrase = (dialog_title or "Select").lower()
-        for hwnd in new_hwnds:
-            length = user32.GetWindowTextLengthW(hwnd)
-            if length > 0:
-                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
+        def _enum_after(hwnd, lParam):
+            hwnd_list_after.append(hwnd)
+            return True
 
-        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)
+        cb_after = EnumWindowsProc(_enum_after)  # garder une référence !
+        user32.EnumWindows(cb_after, 0)
 
-        if selector_hwnd:
-            threading.Thread(target=enforce_modal, args=(selector_hwnd,), daemon=True).start()
+        new_hwnds = list(set(hwnd_list_after) - set(hwnd_list_before))
 
-        # Lecture du buffer brut
+        # ... le reste de ton code (détection de la fenêtre, thread enforce_modal, parsing buffer) ...
         buffer_content = ctypes.wstring_at(ctypes.addressof(file_buffer), file_buffer._length_)
+        parts = [p.replace("\\", "/") for p in buffer_content.split("\0") if p]
 
-        # Split sur \0
-        parts = buffer_content.split('\0')
-        parts = [p.replace("\\", "/") for p in parts if p]
         if multi_select:
             if len(parts) >= 2:
                 folder = parts[0]
                 files = parts[1:]
-                full_paths = [f"{folder}/{file}" for file in files]
-                return '//////'.join(full_paths)
-            elif len(parts) == 1:
-                return parts[0]
-            else:
-                return ""
+                return "//////".join([f"{folder}/{f}" for f in files])
+            return parts[0] if parts else ""
         else:
             return parts[0] if parts else ""
 

{aait-2.3.14.2 → aait-2.3.15}/orangecontrib/AAIT/widgets/OWConverseLLM.py

@@ -2,7 +2,7 @@ import os
 import sys
 
 import Orange.data
-from AnyQt.QtWidgets import QApplication, QLabel, QWidget, QScrollArea, QLineEdit, QHBoxLayout, QVBoxLayout
+from AnyQt.QtWidgets import QApplication, QLabel, QWidget, QScrollArea, QLineEdit, QHBoxLayout, QVBoxLayout, QDoubleSpinBox, QSpinBox
 from AnyQt.QtCore import Qt
 from Orange.widgets import widget
 from Orange.widgets.utils.signals import Input, Output
@@ -40,6 +40,15 @@ class OWConverseLLM(widget.OWWidget):
         data = Output("Data", Orange.data.Table)
 
     n_ctx: str = Setting("32768")
+    workflow_id = Setting("")
+
+    max_tokens = Setting(0)
+    temperature = Setting(0.4)
+    top_p = Setting(0.4)
+    top_k = Setting(40)
+    repeat_penalty = Setting(1.15)
+    k_cache = Setting(0)
+    v_cache = Setting(0)
 
     @Inputs.data
     def set_data(self, in_data):
@@ -55,7 +64,7 @@ class OWConverseLLM(widget.OWWidget):
         self.model_path = in_model_path
         # Reset everything when changing model
         self.conversation = []
-        # self.textBrowser.setText("") # TODO render Qt UI
+        self.clear_chat_area() # TODO render Qt UI
 
         # If there is already a model
         if self.model is not None:
@@ -86,10 +95,21 @@ class OWConverseLLM(widget.OWWidget):
         self.lineEdit_n_ctx = self.findChild(QLineEdit, "lineEdit")
         self.lineEdit_n_ctx.setText(str(self.n_ctx))
         self.lineEdit_n_ctx.editingFinished.connect(self.update_n_ctx)
-        # Workflow ID TODO
-        self.lineEdit_workflow_id = self.findChild(QLineEdit, "lineEdit_2")
-        # parameters : TODO
-
+        # Context cache
+        self.comboKCache.setCurrentIndex(self.k_cache)
+        self.comboVCache.setCurrentIndex(self.v_cache)
+        self.comboKCache.currentIndexChanged.connect(self.update_cache)
+        self.comboVCache.currentIndexChanged.connect(self.update_cache)
+        # Workflow ID for streaming
+        self.edit_ID = self.findChild(QLineEdit, 'lineEdit_2')
+        self.edit_ID.setText(self.workflow_id)
+        self.edit_ID.editingFinished.connect(self.update_workflow_id)
+        # SpinBoxes
+        self.edit_max_tokens = self.bind_spinbox("boxMaxTokens", self.max_tokens)
+        self.edit_temperature = self.bind_spinbox("boxTemperature", self.temperature, is_double=True)
+        self.edit_top_p = self.bind_spinbox("boxTopP", self.top_p, is_double=True)
+        self.edit_top_k = self.bind_spinbox("boxTopK", self.top_k)
+        self.edit_repeat_penalty = self.bind_spinbox("boxRepeatPenalty", self.repeat_penalty, is_double=True)
         # Chat display
         self.scrollArea_display = self.findChild(QScrollArea, "scrollArea")
         self.scrollArea_display.setWidgetResizable(True)
@@ -97,9 +117,7 @@ class OWConverseLLM(widget.OWWidget):
         self.vLayout_display = QVBoxLayout(self.widget_display)
         self.vLayout_display.addStretch()
 
-
-
-        # # Data Management
+        # Data Management
         self.data = None
         self.model = None
         self.model_path = None
@@ -116,9 +134,36 @@ class OWConverseLLM(widget.OWWidget):
         self.post_initialized()
 
     def update_n_ctx(self):
-        value = self.lineEdit_n_ctx.text()  # Read the current value
-        self.n_ctx = value if value.isdigit() else "32768"  # Default or parsed value
-        # answers.check_gpu(self.model_path, self)
+        value = self.lineEdit_n_ctx.text()
+        self.n_ctx = value if value.isdigit() else "32768"
+        # answers.check_gpu(self.model_path, self) # TODO reload model
+
+    def update_cache(self):
+        self.k_cache = self.comboKCache.currentIndex()
+        self.v_cache = self.comboVCache.currentIndex()
+
+    def update_workflow_id(self):
+        self.workflow_id = self.edit_ID.text()
+
+    def bind_spinbox(self, name, value, is_double=False):
+        widget_type = QDoubleSpinBox if is_double else QSpinBox
+        box = self.findChild(widget_type, name)
+        box.setValue(value)
+        box.editingFinished.connect(self.update_parameters)
+        return box
+
+    def update_parameters(self):
+        self.max_tokens = self.edit_max_tokens.value()
+        self.temperature = self.edit_temperature.value()
+        self.top_p = self.edit_top_p.value()
+        self.top_k = self.edit_top_k.value()
+        self.repeat_penalty = self.edit_repeat_penalty.value()
+        print("Updated parameters:")
+        print(f"  Max tokens     : {self.max_tokens}")
+        print(f"  Temperature    : {self.temperature}")
+        print(f"  Top P          : {self.top_p}")
+        print(f"  Top K          : {self.top_k}")
+        print(f"  Repeat penalty : {self.repeat_penalty}")
 
     def run(self):
         # Clear error & warning
@@ -143,6 +188,16 @@ class OWConverseLLM(widget.OWWidget):
             self.Outputs.data.send(None)
             return
 
+        query_parameters = {
+            "max_tokens": self.max_tokens,
+            "temperature": self.temperature,
+            "top_p": self.top_p,
+            "top_k": self.top_k,
+            "repeat_penalty": self.repeat_penalty,
+            "k_cache": self.k_cache,
+            "v_cache": self.v_cache
+        }
+
         # Start progress bar
         self.progressBarInit()
 
@@ -150,7 +205,7 @@ class OWConverseLLM(widget.OWWidget):
         # --> progress is used in the main function to track progress (with a callback)
         # --> result is used to collect the result from main function
         # --> finish is just an empty signal to indicate that the thread is finished
-        self.thread = thread_management.Thread(answers_llama.generate_conversation, self.data, self.model, self.conversation, int(self.n_ctx))
+        self.thread = thread_management.Thread(answers_llama.generate_conversation, self.data, self.model, self.conversation, int(self.n_ctx), query_parameters, self.workflow_id)
         self.thread.progress.connect(self.handle_progress)
         self.thread.result.connect(self.handle_result)
         self.thread.finish.connect(self.handle_finish)
@@ -181,9 +236,9 @@ class OWConverseLLM(widget.OWWidget):
 
     def handle_result(self, result):
         try:
-            self.data = result[0]
+            self.result = result[0]
             self.conversation = result[1]
-            self.Outputs.data.send(self.data)
+            self.Outputs.data.send(self.result)
         except Exception as e:
             print("An error occurred when sending out_data:", e)
             self.Outputs.data.send(None)
@@ -211,7 +266,23 @@ class OWConverseLLM(widget.OWWidget):
     def scroll_to_bottom(self):
         self.scrollArea_display.verticalScrollBar().setValue(self.scrollArea_display.verticalScrollBar().maximum())
 
-
+    # UI # TODO à tester
+    def clear_chat_area(self):
+        """
+        Supprime uniquement les cartes de message sans casser le layout.
+        """
+        for i in reversed(range(self.vLayout_display.count())):
+            item = self.vLayout_display.itemAt(i)
+            widget = item.widget()
+
+            # On ne supprime que les widgets qui sont des cartes
+            if isinstance(widget, (UserMessageCard, AssistantMessageCard)):
+                widget.setParent(None)  # Détache du layout
+                widget.deleteLater()  # Supprime de la mémoire
+            elif widget is None and item.spacerItem():
+                # Optionnel : si tu veux garder ton "ressort" du bas,
+                # ne fais rien ici.
+                pass
 
 
 

{aait-2.3.14.2 → aait-2.3.15}/orangecontrib/AAIT/widgets/OWFileWithPath.py

@@ -148,6 +148,7 @@ class OWFileWithPath(base_widget.BaseListWidget):
         self.error("")
         self.warning("")
 
+
         if self.filepath is None:
             return
 
@@ -156,15 +157,15 @@ class OWFileWithPath(base_widget.BaseListWidget):
             self.error("error input file doesn t exist")
             self.Outputs.data.send(None)
             return
-
-        # Verification of in_data
-        if not self.selected_column_name in self.in_path_table.domain:
-            self.warning(f'Previously selected column "{self.selected_column_name}" does not exist in your data.')
-            return
-
-        if not isinstance(self.in_path_table.domain[self.selected_column_name], StringVariable):
-            self.error('You must select a text variable.')
-            return
+        if self.in_path_table is not None:
+              # Verification of in_data
+            if not self.selected_column_name in self.in_path_table.domain:
+                self.warning(f'Previously selected column "{self.selected_column_name}" does not exist in your data.')
+                return
+
+            if not isinstance(self.in_path_table.domain[self.selected_column_name], StringVariable):
+                self.error('You must select a text variable.')
+                return
 
         if self.strloadAsString!="False":
             out_data = self.load_table_as_strings(self.filepath)

{aait-2.3.14.2 → aait-2.3.15}/orangecontrib/AAIT/widgets/OWLLMEngine.py

@@ -48,8 +48,8 @@ class OWQEdgeLLM(widget.OWWidget):
     top_p = Setting(0.4)
     top_k = Setting(40)
     repeat_penalty = Setting(1.15)
-    k_cache = Setting(0)
-    v_cache = Setting(0)
+    k_cache = Setting(1)
+    v_cache = Setting(1)
 
     @Inputs.data
     def set_data(self, in_data):
@@ -208,6 +208,8 @@ class OWQEdgeLLM(widget.OWWidget):
                 self.textBrowser.insertPlainText(value)
         elif action == "warning":
             self.warning(value)
+        elif action == "error":
+            self.error(value)
 
     def handle_result(self, result):
         if result is None:

{aait-2.3.14.2 → aait-2.3.15}/orangecontrib/AAIT/widgets/OWTrigger.py

@@ -28,7 +28,7 @@ class OWTrigger(widget.OWWidget):
 
     class Inputs:
         data = Input("Data", Orange.data.Table)
-        trigger = Input("Trigger",object)
+        trigger = Input("Trigger", object)
 
     class Outputs:
         data = Output("Data", Orange.data.Table)