aait 2.3.12.2__tar.gz → 2.3.13__tar.gz

{aait-2.3.12.2 → aait-2.3.13}/PKG-INFO

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

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

@@ -72,6 +72,7 @@ orangecontrib/AAIT/widgets/OWFusionNM.py
 orangecontrib/AAIT/widgets/OWGenerateQuestions.py
 orangecontrib/AAIT/widgets/OWGenerateSynthesis.py
 orangecontrib/AAIT/widgets/OWGenerateWord.py
+orangecontrib/AAIT/widgets/OWGetPages.py
 orangecontrib/AAIT/widgets/OWInputSelector.py
 orangecontrib/AAIT/widgets/OWKeywords.py
 orangecontrib/AAIT/widgets/OWKeywordsDetection.py
@@ -144,6 +145,7 @@ orangecontrib/AAIT/widgets/designer/owfusion_nm.ui
 orangecontrib/AAIT/widgets/designer/owgenerate_word.ui
 orangecontrib/AAIT/widgets/designer/owgeneratequestions.ui
 orangecontrib/AAIT/widgets/designer/owgeneratesynthesis.ui
+orangecontrib/AAIT/widgets/designer/owgetpages.ui
 orangecontrib/AAIT/widgets/designer/owkeyword.ui
 orangecontrib/AAIT/widgets/designer/owkeywordsdetection.ui
 orangecontrib/AAIT/widgets/designer/owlangdetect.ui
@@ -190,6 +192,7 @@ orangecontrib/AAIT/widgets/icons/Mistral.png
 orangecontrib/AAIT/widgets/icons/Table.svg
 orangecontrib/AAIT/widgets/icons/apply_rules.svg
 orangecontrib/AAIT/widgets/icons/blue_down_arrow.svg
+orangecontrib/AAIT/widgets/icons/book.png
 orangecontrib/AAIT/widgets/icons/category.svg
 orangecontrib/AAIT/widgets/icons/dark_green.txt
 orangecontrib/AAIT/widgets/icons/de.png

{aait-2.3.12.2 → aait-2.3.13}/orangecontrib/AAIT/llm/answers_llama.py

@@ -6,9 +6,15 @@ try:
 except:
     pass
 import psutil
+import base64
 import ntpath
 import platform
 from llama_cpp import Llama
+try:
+    from llama_cpp.llama_chat_format import Qwen3VLChatHandler
+except Exception as e:
+    print("Missing installs for Qwen3-VL:", e)
+    pass
 from Orange.data import Domain, StringVariable, Table
 
 
@@ -105,7 +111,7 @@ def count_tokens(model: Llama, text: str) -> int:
     return len(tokens)
 
 
-def load_model(model_path, use_gpu, n_ctx=10000):
+def load_model(model_path, use_gpu, n_ctx=10000, k_cache=0, v_cache=0):
     """
     Charge un modèle GGUF avec llama_cpp.Llama.
 
@@ -135,6 +141,8 @@ def load_model(model_path, use_gpu, n_ctx=10000):
             use_mlock=False,
             embedding=False,
             verbose=True, #hahahahahaha remettre a False
+            type_k=k_cache,
+            type_v=v_cache
         )
         return model
     except Exception as e:
@@ -153,7 +161,14 @@ def generate_answers(table, model_path, use_gpu=False, n_ctx=4096, query_paramet
     class_dom = list(data.domain.class_vars)
 
     # Chargement modèle (llama_cpp)
-    model = load_model(model_path=model_path, use_gpu=use_gpu, n_ctx=n_ctx)
+    if not "Qwen3-VL-8B-Instruct" in model_path:
+        model = load_model(model_path=model_path,
+                           use_gpu=use_gpu,
+                           n_ctx=n_ctx,
+                           k_cache=query_parameters["k_cache"],
+                           v_cache=query_parameters["v_cache"])
+    else:
+        model = load_Qwen3VL(model_path=model_path, n_ctx=n_ctx)
     if model is None:
         return None
     # Paramètres de génération par défaut
@@ -172,27 +187,34 @@ def generate_answers(table, model_path, use_gpu=False, n_ctx=4096, query_paramet
             assistant_prompt = row["assistant prompt"].value if "assistant prompt" in data.domain else ""
 
             # Appliquer ton template existant (inchangé)
-            prompt = prompt_management.apply_prompt_template(
-                model_path,
-                user_prompt=prompt,
-                assistant_prompt=assistant_prompt,
-                system_prompt=system_prompt
-            )
-
-            prompt = handle_context_length(prompt, model, n_ctx, method="truncate", 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
-            )
+            if not "Qwen3-VL-8B-Instruct" in model_path:
+                prompt = prompt_management.apply_prompt_template(
+                    model_path,
+                    user_prompt=prompt,
+                    assistant_prompt=assistant_prompt,
+                    system_prompt=system_prompt
+                )
+
+                prompt = handle_context_length(prompt, model, n_ctx, method="truncate", margin=query_parameters["max_tokens"], 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
+                )
+            else:
+                image_paths = [p.strip() for p in row["image paths"].value.split(";")] if "image paths" in data.domain else []
+                answer = run_Qwen3VL_query(query=prompt,
+                                           image_paths=image_paths,
+                                           model=model,
+                                           progress_callback=progress_callback)
 
             if answer == "":
                 answer = (
@@ -251,6 +273,7 @@ class StopCallback:
 
         return True  # Continue generation
 
+
 def write_tokens_to_file(token: str, workflow_id=""):
     chemin_dossier = MetManagement.get_api_local_folder(workflow_id=workflow_id)
     if os.path.exists(chemin_dossier):
@@ -325,7 +348,7 @@ def run_query(prompt, model, max_tokens=4096, temperature=0, top_p=0, top_k=40,
     return answer
 
 
-def generate_conversation(table, model, conversation=None, n_ctx=32768, progress_callback=None, argself=None):
+def generate_conversation(table, model, conversation=None, n_ctx=32768, query_parameters=None, workflow_id="", progress_callback=None, argself=None):
     """
     Generates a response using a language model and appends it to a conversation.
 
@@ -380,7 +403,7 @@ def generate_conversation(table, model, conversation=None, n_ctx=32768, progress
     prompt += prompt_management.apply_user_template(model_path, user_prompt)
     prompt += prompt_management.apply_assistant_template(model_path, assistant_prompt)
 
-    prompt = handle_context_length(prompt, model, n_ctx, method="truncate", progress_callback=progress_callback)
+    prompt = handle_context_length(prompt, model, n_ctx, method="truncate", margin=query_parameters["max_tokens"], progress_callback=progress_callback)
 
     # Return progression to fill the user & assistant cards
     progress_callback(("user", user_prompt))
@@ -390,7 +413,7 @@ def generate_conversation(table, model, conversation=None, n_ctx=32768, progress
     conversation.append({"role": "user", "content": user_prompt})
 
     # Generate the answer
-    answer = run_query(prompt, model=model, argself=argself, progress_callback=progress_callback)
+    answer = run_query(prompt, model=model, argself=argself, workflow_id=workflow_id, progress_callback=progress_callback)
 
     # Split the thinking block and remove it from the answer
     think_text, final_answer = split_think(answer=answer)
@@ -431,13 +454,6 @@ def split_think(answer: str):
     return think_text, final_answer
 
 
-def conversation_to_text(conversation):
-    if not conversation:
-        return ""
-    else:
-        pass #TODO
-
-
 def handle_context_length(prompt, model, n_ctx, method="truncate", margin=0, progress_callback=None):
     """
     Truncate a prompt to fit within n_ctx tokens, leaving margin for generation.
@@ -456,11 +472,72 @@ def handle_context_length(prompt, model, n_ctx, method="truncate", margin=0, pro
             prompt = model.detokenize(tokens).decode("utf-8") if tokens else ""
             if progress_callback:
                 warning = (
-                    f"Complete prompt contains {initial_length} tokens - context limit is {limit}. "
+                    f"Complete prompt contains {initial_length} tokens - context limit is {limit} (Context length - Max tokens). "
                     f"The {truncated_length} last tokens have been kept in the prompt."
                 )
                 progress_callback(("warning", warning))
         return prompt
+    elif method == "summarize":
+        pass
     else:
         return prompt
 
+
+
+# For pure display
+def conversation_to_text(conversation):
+    if not conversation:
+        return ""
+    else:
+        pass #TODO
+
+
+
+def load_Qwen3VL(model_path, n_ctx=32768):
+    folder = os.path.dirname(model_path)
+    mmproj_path = os.path.join(folder, "mmproj-Qwen3-VL-8B-Instruct-F16.gguf")
+    if not os.path.exists(mmproj_path):
+        print("Something is wrong with your model : couldn't find mmproj-Qwen3-VL-8B-Instruct-F16.gguf")
+        return None
+    chat_handler = Qwen3VLChatHandler(clip_model_path=mmproj_path)
+    model = Llama(model_path=model_path,
+                  chat_handler=chat_handler,
+                  n_ctx=n_ctx,
+                  n_gpu_layers=-1)
+    return model
+
+
+def run_Qwen3VL_query(query, image_paths, model, system_prompt=" ", progress_callback=None):
+    image_messages = []
+    for image_path in image_paths:
+        data_uri = convert_to_uri(image_path)
+        image_messages.append({"type": "image_url", "image_url": {"url": data_uri}})
+    image_messages.append({"type": "text", "text": query})
+
+    messages = [{"role": "system", "content": system_prompt},
+                {"role": "user", "content": image_messages}]
+    generator = model.create_chat_completion(messages=messages, stream=True)
+
+    full_response = ""
+    for chunk in generator:
+        # chunk is a dict, often with a 'choices' list
+        for choice in chunk.get("choices", []):
+            # Each choice may have a 'delta' dict with 'content'
+            delta = choice.get("delta", {})
+            token = delta.get("content")
+            if token:
+                full_response += token
+                if progress_callback is not None:
+                    progress_callback(("assistant", token))
+    return full_response
+
+
+
+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
+
+

{aait-2.3.12.2 → aait-2.3.13}/orangecontrib/AAIT/widgets/OWConverseLLM.py

@@ -164,7 +164,7 @@ class OWConverseLLM(widget.OWWidget):
         elif action == "user":
             user_card = UserMessageCard(value)
             self.add_message_card(user_card)
-        elif action == "assistant:":
+        elif action == "assistant":
             if self.current_assistant_card is None:
                 assistant_card = AssistantMessageCard(value)
                 self.add_message_card(assistant_card)

{aait-2.3.12.2 → aait-2.3.13}/orangecontrib/AAIT/widgets/OWExtractTokens.py

@@ -3,7 +3,6 @@ import sys
 
 from Orange.data import Table, Domain, StringVariable
 from AnyQt.QtWidgets import QApplication
-from Orange.widgets import widget
 from Orange.widgets.settings import Setting
 from Orange.widgets.utils.signals import Input, Output
 
@@ -15,7 +14,7 @@ if "site-packages/Orange/widgets" in os.path.dirname(os.path.abspath(__file__)).
 else:
     from orangecontrib.AAIT.utils.import_uic import uic
     from orangecontrib.AAIT.utils.initialize_from_ini import apply_modification_from_python_file
-
+    from orangecontrib.AAIT.utils import base_widget
 
 @apply_modification_from_python_file(filepath_original_widget=__file__)
 class OWExtractTokens(base_widget.BaseListWidget):
@@ -28,7 +27,7 @@ class OWExtractTokens(base_widget.BaseListWidget):
     gui = os.path.join(os.path.dirname(os.path.abspath(__file__)), "designer/owextracttokens.ui")
     want_control_area = False
     priority = 1060
-    selected_column_name = Setting("")
+    selected_column_name = Setting("content")
 
     class Inputs:
         data = Input("Data", Table)
@@ -51,7 +50,7 @@ class OWExtractTokens(base_widget.BaseListWidget):
         # Qt Management
         self.setFixedWidth(470)
         self.setFixedHeight(600)
-        uic.loadUi(self.gui, self)
+        #uic.loadUi(self.gui, self)
 
         # Data Management
         self.data = None

{aait-2.3.12.2 → aait-2.3.13}/orangecontrib/AAIT/widgets/OWFileWithPath.py

@@ -2,9 +2,8 @@ import os
 import sys
 
 import Orange.data
-from AnyQt.QtWidgets import QApplication
+from AnyQt.QtWidgets import QApplication, QPushButton
 from Orange.data import StringVariable
-from Orange.widgets import widget
 from Orange.widgets.utils.signals import Input, Output
 from AnyQt.QtWidgets import QCheckBox
 from Orange.widgets.settings import Setting
@@ -29,7 +28,7 @@ class OWFileWithPath(base_widget.BaseListWidget):
     priority = 1060
 
     # Settings
-    selected_column_name = Setting("content")
+    selected_column_name = Setting("path")
 
     class Inputs:
         filepath = Input("Path", str, auto_summary=False)
@@ -50,14 +49,16 @@ class OWFileWithPath(base_widget.BaseListWidget):
     @Inputs.path_table
     def set_path_table(self, in_path_table):
         self.in_path_table = in_path_table
+        if self.in_path_table is None:
+            self.Outputs.data.send(None)
+            return
         if self.in_path_table is not None:
             self.var_selector.add_variables(self.in_path_table.domain)
             self.var_selector.select_variable_by_name(self.selected_column_name)
-            if "path" in in_path_table.domain:
-                self.filepath = in_path_table[0]["path"].value
-                self.run()
-            else:
-                self.warning("You need a 'path' variable from which the data will be loaded.")
+
+            self.filepath = in_path_table[0][self.selected_column_name].value
+            self.run()
+
         if self.autorun:
             self.run()
 
@@ -66,6 +67,8 @@ class OWFileWithPath(base_widget.BaseListWidget):
         super().__init__()
         # Qt Management
         #uic.loadUi(self.gui, self)
+        self.setFixedWidth(500)
+        self.setFixedHeight(450)
         self.checkbox_interface = self.findChild(QCheckBox, 'checkBox')
         if self.strloadAsString=="False":
             self.checkbox_interface.setChecked(False)
@@ -80,6 +83,9 @@ class OWFileWithPath(base_widget.BaseListWidget):
         self.data = None
         self.autorun = True
         self.post_initialized()
+
+        self.pushButton_run = self.findChild(QPushButton, 'pushButton_send')
+        self.pushButton_run.clicked.connect(self.run)
     def on_checkbox_toggled(self):
         if self.checkbox_interface.isChecked():
             self.strloadAsString="True"

{aait-2.3.12.2 → aait-2.3.13}/orangecontrib/AAIT/widgets/OWFindFilesFromDir.py

@@ -54,7 +54,7 @@ class OWFileFromDir(base_widget.BaseListWidget):
         super().__init__()
         # Qt Management
         self.setFixedWidth(500)
-        self.setFixedHeight(600)
+        self.setFixedHeight(620)
         if self.is_dash_int_castable(self.time_filter)!=0:
             self.time_filter = "0-0-0-1"
 
@@ -332,10 +332,8 @@ class OWFileFromDir(base_widget.BaseListWidget):
 
 if __name__ == "__main__":
     app = QApplication(sys.argv)
-    #data = Orange.data.Table(r"C:\Users\max83\Desktop\data.tab")
     my_widget = OWFileFromDir()
     my_widget.show()
-    #my_widget.set_path_table(data)
 
     if hasattr(app, "exec"):
         app.exec()