IO4IT 4.0.25__tar.gz → 4.0.26__tar.gz

{io4it-4.0.25 → io4it-4.0.26}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: io4it
-Version: 4.0.25
+Version: 4.0.26
 Home-page: 
 Author: 
 Author-email: 

{io4it-4.0.25 → io4it-4.0.26}/io4it.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: io4it
-Version: 4.0.25
+Version: 4.0.26
 Home-page: 
 Author: 
 Author-email: 

{io4it-4.0.25 → io4it-4.0.26}/orangecontrib/IO4IT/utils/custom_api.py

@@ -1,11 +1,18 @@
-import base64
-import mimetypes
 import os
+import re
+import json
+import copy
+import numpy as np
 
 import requests
 
-import Orange.data
-from Orange.data import StringVariable
+from Orange.data import StringVariable, Table
+
+
+if "site-packages/Orange/widgets" in os.path.dirname(os.path.abspath(__file__)).replace("\\", "/"):
+    from Orange.widgets.orangecontrib.AAIT.llm.answers_llama import write_tokens_to_file, prompt_to_messages, conv_to_messages
+else:
+    from orangecontrib.AAIT.llm.answers_llama import write_tokens_to_file, prompt_to_messages, conv_to_messages
 
 
 def build_headers(header_name, auth_scheme, api_key):
@@ -15,37 +22,25 @@ def build_headers(header_name, auth_scheme, api_key):
     return {"Content-Type": "application/json", header_name: value}
 
 
-def image_to_data_uri(file_path):
-    """Encode a local image file as a base64 data URI."""
-    mime_type, _ = mimetypes.guess_type(file_path)
-    mime_type = mime_type or "application/octet-stream"
-    with open(file_path, "rb") as f:
-        encoded = base64.b64encode(f.read()).decode("utf-8")
-    return f"data:{mime_type};base64,{encoded}"
-
-
-def build_user_content(prompt, image_paths):
-    """Build the 'content' field of a user message, attaching images when provided."""
-    if not image_paths:
-        return str(prompt)
-
-    content = []
-    for image_path in image_paths:
-        image_path = image_path.strip().strip("'").strip('"')
-        if not image_path:
-            continue
-        if not os.path.exists(image_path):
-            content.append({"type": "text", "text": f"[ERROR] Image not found: {image_path}"})
-            continue
-        try:
-            content.append({"type": "image_url", "image_url": {"url": image_to_data_uri(image_path)}})
-        except Exception as e:
-            content.append({"type": "text", "text": f"[ERROR] Unable to read image {image_path}: {e}"})
-    content.append({"type": "text", "text": str(prompt)})
-    return content
+def search_for_streamed_token(decoded_line):
+    r"""
+    /!\ This function is meant to be updated whenever a new response format is identified /!\
 
-
-def call_chat_completion(prompt, system_prompt, config, image_paths=None):
+    Parse a decoded stream response "line" to find the token generated by a LLM.
+    """
+    known_keys = ["content", "reasoning"]
+    dict_regex = r"\{[\s\S]*\}"
+    match = re.search(dict_regex, decoded_line)
+    if not match:
+        return "Token not found"
+    
+    json_data = json.loads(match.group())
+    delta = json_data["choices"][0]["delta"]
+    token = next((delta[key] for key in known_keys if key in delta), "Token not found")
+    return token
+
+
+def call_chat_completion(messages, config, stream=False, workflow_id="Request_RAG"):
     """
     Call a /chat/completions endpoint using the widely adopted chat-completions
     message format. Vision-capable models can be reached by passing image_paths,
@@ -58,11 +53,6 @@ def call_chat_completion(prompt, system_prompt, config, image_paths=None):
     url = config["base_url"].rstrip("/") + config["route"]
     headers = build_headers(config["header_name"], config["auth_scheme"], config["api_key"])
 
-    messages = []
-    if system_prompt:
-        messages.append({"role": "system", "content": str(system_prompt)})
-    messages.append({"role": "user", "content": build_user_content(prompt, image_paths)})
-
     payload = {
         "model": config["model"],
         "messages": messages,
@@ -86,10 +76,25 @@ def call_chat_completion(prompt, system_prompt, config, image_paths=None):
         proxy_url = config.get("proxy_url") or ""
         kwargs["proxies"] = {"http": proxy_url, "https": proxy_url}
 
-    response = requests.post(url, headers=headers, json=payload, **kwargs)
+    response = requests.post(url, headers=headers, json=payload, stream=stream, **kwargs)
     response.raise_for_status()
-    data = response.json()
-    return data["choices"][0]["message"]["content"]
+
+    if not stream:
+        data = response.json()
+        return data["choices"][0]["message"]["content"]
+    else:
+        answer = ""
+        for line in response.iter_lines():
+            if line:
+                decoded_line = line.decode("utf-8")
+                try:
+                    token = search_for_streamed_token(decoded_line)
+                except Exception as e:
+                    token = "Error"
+                    print("An error occured when trying to get token from stream response:", e)
+                answer += token
+                write_tokens_to_file(token, workflow_id=workflow_id)
+        return answer
 
 
 def generate_answers(data, config, progress_callback=None):
@@ -116,8 +121,9 @@ def generate_answers(data, config, progress_callback=None):
         prompt = prompts[i]
         system_prompt = system_prompts[i] if system_prompts is not None else None
         image_paths = image_paths_column[i].split(";") if image_paths_column is not None else None
+        messages = prompt_to_messages(prompt, system_prompt, image_paths)
         try:
-            answer = call_chat_completion(prompt, system_prompt, config, image_paths)
+            answer = call_chat_completion(messages, config, stream=True)
         except requests.HTTPError as e:
             body = e.response.text if e.response is not None else str(e)
             answer = f"[ERROR] HTTP {e.response.status_code if e.response is not None else '?'}: {body}"
@@ -130,3 +136,38 @@ def generate_answers(data, config, progress_callback=None):
 
     answer_var = StringVariable("Answer")
     return data.add_column(answer_var, answers)
+
+
+
+def continue_conversation(table, config, progress_callback=None):
+    """
+    Runs call_chat_completion considering the table as a conversation (list of messages).
+    """
+    data = copy.deepcopy(table)
+    messages = conv_to_messages(data)
+    if not messages:
+        return data
+
+    try:
+        answer = call_chat_completion(messages, config, stream=True)
+    except requests.HTTPError as e:
+        body = e.response.text if e.response is not None else str(e)
+        answer = f"[ERROR] HTTP {e.response.status_code if e.response is not None else '?'}: {body}"
+    except Exception as e:
+        answer = f"[ERROR] {e}"
+
+    # Create output table
+    meta = data.metas[-1].copy()
+    meta_names = [m.name for m in data.domain.metas]
+    meta[meta_names.index("role")] = "assistant"
+    meta[meta_names.index("type")] = "text"
+    meta[meta_names.index("content")] = answer
+    empty_x = np.zeros((1, len(data.domain.attributes)))
+
+    new_row = Table.from_numpy(
+        data.domain,
+        X=empty_x,
+        metas=np.array([meta], dtype=object)
+    )
+    out_data = Table.concatenate([data, new_row])
+    return out_data

{io4it-4.0.25 → io4it-4.0.26}/orangecontrib/IO4IT/widgets/OWCustomLLMApi.py

@@ -13,11 +13,13 @@ from AnyQt.QtWidgets import (
 if "site-packages/Orange/widgets" in os.path.dirname(os.path.abspath(__file__)).replace("\\", "/"):
     from Orange.widgets.orangecontrib.IO4IT.utils import custom_api
     from Orange.widgets.orangecontrib.AAIT.utils import thread_management
+    from Orange.widgets.orangecontrib.AAIT.llm.answers_llama import identify_table_type
     from Orange.widgets.orangecontrib.AAIT.utils.import_uic import uic
     from Orange.widgets.orangecontrib.AAIT.utils.initialize_from_ini import apply_modification_from_python_file
 else:
     from orangecontrib.IO4IT.utils import custom_api
     from orangecontrib.AAIT.utils import thread_management
+    from orangecontrib.AAIT.llm.answers_llama import identify_table_type
     from orangecontrib.AAIT.utils.import_uic import uic
     from orangecontrib.AAIT.utils.initialize_from_ini import apply_modification_from_python_file
 
@@ -192,8 +194,14 @@ class OWCustomLLMApi(widget.OWWidget):
         if self.data is None:
             self.Outputs.data.send(None)
             return
-        if "prompt" not in self.data.domain:
-            self.error("Input table needs a 'prompt' column.")
+
+        table_type = identify_table_type(self.data)
+        if table_type == "error":
+            self.error("The table must contain either (StringVariable):\n- role + type + content\nor:\n- prompt (image paths)")
+            self.Outputs.data.send(None)
+            return
+        elif table_type == "multiple":
+            self.error("Cannot have role/type/content and prompt simultaneously.")
             self.Outputs.data.send(None)
             return
 
@@ -213,7 +221,11 @@ class OWCustomLLMApi(widget.OWWidget):
         self.progressBarInit()
         self.textBrowser.setText("")
 
-        self.thread = thread_management.Thread(custom_api.generate_answers, self.data, self.build_config())
+
+        if table_type == "batch":
+            self.thread = thread_management.Thread(custom_api.generate_answers, self.data, self.build_config())
+        elif table_type == "conversation":
+            self.thread = thread_management.Thread(custom_api.continue_conversation, self.data, self.build_config())
         self.thread.progress.connect(self.handle_progress)
         self.thread.result.connect(self.handle_result)
         self.thread.finish.connect(self.handle_finish)

{io4it-4.0.25 → io4it-4.0.26}/orangecontrib/IO4IT/widgets/OWExportMarkdown.py

@@ -265,8 +265,8 @@ class OWExportMarkdown(widget.OWWidget):
                     )
                     self.ajouter_entete_pied_pptx(
                         pptx_out,
-                        "Orange AI – Présentation",
-                        "Page générée automatiquement"
+                        "TigerODM – Présentation",
+                        "Page générée automatiquement par IA"
                     )
                     produced_pptx = pptx_out if os.path.isfile(pptx_out) else ""
 

{io4it-4.0.25 → io4it-4.0.26}/orangecontrib/IO4IT/widgets/OWProcessPoolExecutor.py

@@ -1,6 +1,7 @@
 import os
 import sys
-from AnyQt.QtWidgets import QSpinBox, QLabel, QPushButton, QGroupBox, QCheckBox
+from AnyQt.QtWidgets import QSpinBox, QLabel, QPushButton, QGroupBox, QCheckBox, QApplication
+from AnyQt.QtCore import QTimer
 from Orange.widgets import widget
 from Orange.widgets.utils.signals import Output
 from Orange.widgets.settings import Setting
@@ -8,9 +9,11 @@ from Orange.widgets.settings import Setting
 if "site-packages/Orange/widgets" in os.path.dirname(os.path.abspath(__file__)).replace("\\", "/"):
     from Orange.widgets.orangecontrib.IO4IT.utils import pool_exec_utils
     from Orange.widgets.orangecontrib.AAIT.utils.import_uic import uic
+    from Orange.widgets.orangecontrib.AAIT.utils import help_management
 else:
     from orangecontrib.IO4IT.utils import pool_exec_utils
     from orangecontrib.AAIT.utils.import_uic import uic
+    from orangecontrib.AAIT.utils import help_management
 
 
 class OWProcessPoolExecutor(widget.OWWidget):
@@ -24,7 +27,8 @@ class OWProcessPoolExecutor(widget.OWWidget):
     want_control_area = False
     priority = 900
 
-    auto_send = Setting(False)
+    str_workers: str = Setting("4")
+    str_autosend: str = Setting("False")
 
     class Outputs:
         executor = Output("ProcessPoolExecutor", object)
@@ -41,51 +45,70 @@ class OWProcessPoolExecutor(widget.OWWidget):
 
         self.cpu_label = self.findChild(QLabel, "cpu_label")
         self.spin_workers = self.findChild(QSpinBox, "spin_workers")
-        self.btn_create = self.findChild(QPushButton, "btn_create")
         self.info_label = self.findChild(QLabel, "info_label")
         self.group_box = self.findChild(QGroupBox, "groupBox")
         self.checkBox_send = self.findChild(QCheckBox, "checkBox_send")
+        self.pushButton_send = self.findChild(QPushButton, "pushButton_send")
 
+        # Initialisation de la vue du nombre de CPU et SpinBox
+        max_cpus = max(1, pool_exec_utils.available_cpus())
         if self.cpu_label:
             self.cpu_label.setText(pool_exec_utils.cpu_label_text())
 
         if self.spin_workers:
             self.spin_workers.setMinimum(1)
-            max_cpus = max(1, pool_exec_utils.available_cpus())
             self.spin_workers.setMaximum(max_cpus)
-            self.spin_workers.setValue(min(4, max_cpus))
+
+            # Restauration du nombre de workers depuis les Settings
+            try:
+                val = int(self.str_workers)
+            except ValueError:
+                val = min(4, max_cpus)
+            self.spin_workers.setValue(min(max(1, val), max_cpus))
             self.spin_workers.valueChanged.connect(self._on_workers_changed)
 
+        # Restauration de l'état Auto Send
         if self.checkBox_send:
-            self.checkBox_send.setChecked(self.auto_send)
-            self.checkBox_send.toggled.connect(self._on_autorun_toggled)
+            self.checkBox_send.setChecked(self.str_autosend == "True")
+            self.checkBox_send.clicked.connect(self._on_autorun_toggled)
 
-        if self.btn_create:
-            self.btn_create.setEnabled(not self.auto_send)
-            self.btn_create.clicked.connect(self.create_or_update_clicked)
+        # Bouton d'exécution manuelle
+        if self.pushButton_send:
+            self.pushButton_send.setEnabled(self.str_autosend != "True")
+            self.pushButton_send.clicked.connect(self.create_or_update_clicked)
 
         self.error("")
         self.warning("")
         self.post_initialized()
 
-        # Lancement automatique initial si coché
-        if self.auto_send:
+        QTimer.singleShot(0, lambda: help_management.override_help_action(self))
+
+        # Lancement automatique initial si activé dans les Settings
+        if self.str_autosend == "True":
             self.create_or_update_clicked()
 
     # ------------------------------------------------------------------
-    # Slots UI
+    # Settings & UI Synchronization
     # ------------------------------------------------------------------
-    def _on_autorun_toggled(self, checked: bool):
-        self.auto_send = checked
-        if self.btn_create:
-            self.btn_create.setEnabled(not self.auto_send)
-        # On relance automatiquement s'il vient d'être activé
-        if self.auto_send:
+    def update_setting_from_qt_view(self):
+        """Met à jour les attributs de Setting à partir des composants Qt."""
+        if self.spin_workers:
+            self.str_workers = str(self.spin_workers.value())
+
+        if self.checkBox_send:
+            self.str_autosend = "True" if self.checkBox_send.isChecked() else "False"
+
+        if self.pushButton_send and self.checkBox_send:
+            self.pushButton_send.setEnabled(not self.checkBox_send.isChecked())
+
+    def _on_autorun_toggled(self):
+        self.update_setting_from_qt_view()
+        if self.str_autosend == "True":
             self.create_or_update_clicked()
 
     def _on_workers_changed(self):
-        """Déclenche la mise à jour si le nombre de workers change et que auto_send est actif."""
-        if self.auto_send:
+        self.update_setting_from_qt_view()
+        if self.str_autosend == "True":
             self.create_or_update_clicked()
 
     # ------------------------------------------------------------------

{io4it-4.0.25 → io4it-4.0.26}/orangecontrib/IO4IT/widgets/designer/owprocesspoolexecutor.ui

@@ -11,15 +11,15 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string>Process Pool Executor</string>
   </property>
   <widget class="QGroupBox" name="groupBox">
    <property name="geometry">
     <rect>
      <x>10</x>
-     <y>30</y>
+     <y>20</y>
      <width>451</width>
-     <height>201</height>
+     <height>200</height>
     </rect>
    </property>
    <property name="title">
@@ -29,9 +29,9 @@
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>16</y>
+      <y>20</y>
       <width>431</width>
-      <height>51</height>
+      <height>45</height>
      </rect>
     </property>
     <property name="text">
@@ -50,7 +50,7 @@
       <x>10</x>
       <y>70</y>
       <width>431</width>
-      <height>21</height>
+      <height>20</height>
      </rect>
     </property>
     <property name="text">
@@ -61,9 +61,9 @@
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>110</y>
+      <y>100</y>
       <width>431</width>
-      <height>21</height>
+      <height>20</height>
      </rect>
     </property>
     <property name="text">
@@ -74,40 +74,27 @@
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>140</y>
+      <y>130</y>
       <width>431</width>
-      <height>22</height>
+      <height>25</height>
      </rect>
     </property>
    </widget>
-   <widget class="QPushButton" name="btn_create">
-    <property name="geometry">
-     <rect>
-      <x>10</x>
-      <y>170</y>
-      <width>431</width>
-      <height>23</height>
-     </rect>
-    </property>
-    <property name="text">
-     <string>(Re)create / Update executor</string>
-    </property>
-   </widget>
   </widget>
   <widget class="QPushButton" name="pushButton_send">
    <property name="enabled">
-    <bool>false</bool>
+    <bool>true</bool>
    </property>
    <property name="geometry">
     <rect>
      <x>170</x>
-     <y>244</y>
+     <y>235</y>
      <width>291</width>
-     <height>31</height>
+     <height>32</height>
     </rect>
    </property>
    <property name="text">
-    <string>Run</string>
+    <string>(Re)create / Update executor</string>
    </property>
   </widget>
   <widget class="QCheckBox" name="checkBox_send">
@@ -117,9 +104,9 @@
    <property name="geometry">
     <rect>
      <x>10</x>
-     <y>250</y>
-     <width>131</width>
-     <height>16</height>
+     <y>240</y>
+     <width>150</width>
+     <height>20</height>
     </rect>
    </property>
    <property name="text">

{io4it-4.0.25 → io4it-4.0.26}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 # Configuration
 NAME = "io4it"
-VERSION = "4.0.25"
+VERSION = "4.0.26"
 
 INSTALL_REQUIRES = [
     "torchvision",