aait 2.3.11__tar.gz → 2.3.11.1__tar.gz

{aait-2.3.11 → aait-2.3.11.1}/PKG-INFO

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aait
-Version: 2.3.11
+Version: 2.3.11.1
 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.11 → aait-2.3.11.1}/orangecontrib/AAIT/llm/answers_llama.py

@@ -1,5 +1,6 @@
 import copy
 import os
+import re
 try:
     import GPUtil #sometimes errors occurs on gpu testing
 except:
@@ -188,7 +189,12 @@ def generate_answers(table, model_path, use_gpu=False, n_ctx=4096, query_paramet
                     f"likely not supported yet.\n\nModel name: {ntpath.basename(model_path)}"
                 )
 
-            metas += [answer]
+            thinking = ""
+            matches = re.findall(r"<think>[\s\S]*?</think>", answer)
+            if matches:
+                thinking = matches[0]
+                answer = answer.replace(thinking, "").strip()
+            metas += [answer, thinking]
             rows.append(features + metas)
 
             if progress_callback is not None:
@@ -202,12 +208,13 @@ def generate_answers(table, model_path, use_gpu=False, n_ctx=4096, query_paramet
         return
 
     # Ajouter la colonne "Answer" en metas
-    answer_dom = [StringVariable("Answer")]
+    answer_dom = [StringVariable("Answer"), StringVariable("Thinking")]
 
     domain = Domain(attributes=attr_dom, metas=metas_dom + answer_dom, class_vars=class_dom)
     out_data = Table.from_list(domain=domain, rows=rows)
     return out_data
 
+
 class StopCallback:
     def __init__(self, stop_sequences, widget_thread=None):
         self.stop_sequences = stop_sequences

{aait-2.3.11 → aait-2.3.11.1}/orangecontrib/AAIT/widgets/OWEndLoop.py

@@ -75,6 +75,7 @@ class EndLoopWidget(OWWidget):
                 self.reinitialize_iter()
                 self.Outputs.out_data.send(self.out_data)
                 self.out_data = None
+                self.in_pointer = None
                 return
             # on boucle
             ctypes.cast(int(self.in_pointer), ctypes.py_object).value.execute_iter_of_line_number()

{aait-2.3.11 → aait-2.3.11.1}/orangecontrib/AAIT/widgets/OWExtraChunks.py

@@ -74,19 +74,19 @@ class OWExtraChunks(widget.OWWidget):
 
         domain = self.complete_data.domain
         if "path" not in domain:
-            self.error(f'You need a "path" column in your input tables.')
+            self.error('You need a "path" column in your input tables.')
             self.Outputs.concatenate_data.send(None)
             self.Outputs.data.send(None)
             return
 
         if "Chunks index" not in domain:
-            self.error(f'You need a "Chunks index" column in your input tables.')
+            self.error('You need a "Chunks index" column in your input tables.')
             self.Outputs.concatenate_data.send(None)
             self.Outputs.data.send(None)
             return
 
         if "Chunks" not in domain:
-            self.error(f'You need a "Chunks" column in your input tables.')
+            self.error('You need a "Chunks" column in your input tables.')
             self.Outputs.concatenate_data.send(None)
             self.Outputs.data.send(None)
             return

{aait-2.3.11 → aait-2.3.11.1}/orangecontrib/AAIT/widgets/OWFileSyncChecker.py

@@ -1,7 +1,6 @@
 import os
 from pathlib import Path
 import sys
-import platform
 
 import Orange.data
 from Orange.data import Table, Domain, StringVariable, ContinuousVariable
@@ -61,7 +60,7 @@ class OWFileSyncChecker(widget.OWWidget):
 
         # Data Management
         self.data = None
-        self.reference = None
+        self.reference = "default"
         self.autorun = True
         self.thread = None
         self.result = None
@@ -77,6 +76,13 @@ class OWFileSyncChecker(widget.OWWidget):
                 self.thread.safe_quit()
 
         if self.data is None:
+            self.Outputs.data.send(None)
+            self.Outputs.processed.send(None)
+            return
+
+        if self.reference == "default":
+            self.Outputs.data.send(None)
+            self.Outputs.processed.send(None)
             return
 
         if self.reference is None:
@@ -140,6 +146,8 @@ class OWFileSyncChecker(widget.OWWidget):
             paths_ref[p] = int(row["file size"].value)
             ref_row_for_path[p] = i
 
+        progress_update(20, progress_callback)
+
         # ---- Compute aligned roots once ----
         def common_root(keys):
             if not keys:
@@ -159,6 +167,9 @@ class OWFileSyncChecker(widget.OWWidget):
                 new = p
             aligned_ref[new] = size
 
+
+        progress_update(50, progress_callback)
+
         set_data = set(paths_data.keys())
         set_ref = set(aligned_ref.keys())
 
@@ -180,13 +191,21 @@ class OWFileSyncChecker(widget.OWWidget):
                 if p in ref_row_for_path:
                     remove_indices.add(ref_row_for_path[p])
 
+        progress_update(60, progress_callback)
+
         for p in only_data:
             files_to_process.append([Path(p), paths_data[p]])
 
+
+        progress_update(70, progress_callback)
+
         for p in only_ref:
             if p in ref_row_for_path:
                 remove_indices.add(ref_row_for_path[p])
 
+
+        progress_update(80, progress_callback)
+
         # ---- Build new reference table once ----
         if remove_indices:
             keep_rows = [i for i in range(len(reference)) if i not in remove_indices]
@@ -201,6 +220,8 @@ class OWFileSyncChecker(widget.OWWidget):
             except Exception:
                 pass
 
+        progress_update(100, progress_callback)
+
         # ---- Build output table ----
         path_var = StringVariable("path")
         size_var = ContinuousVariable("file size")
@@ -220,6 +241,8 @@ class OWFileSyncChecker(widget.OWWidget):
         try:
             self.Outputs.data.send(data)
             self.Outputs.processed.send(processed_data)
+            self.data = None
+            self.reference = "default"
         except Exception as e:
             print("An error occurred when sending out_data:", e)
             self.Outputs.data.send(None)
@@ -233,6 +256,12 @@ class OWFileSyncChecker(widget.OWWidget):
         pass
 
 
+def progress_update(value, progress_callback):
+    if progress_callback is not None:
+        progress_value = float(value)
+        progress_callback(progress_value)
+
+
 def remove_from_table(filepath, table):
     """
     Remove rows from the Orange table where 'path' matches the given filepath.

{aait-2.3.11 → aait-2.3.11.1}/orangecontrib/AAIT/widgets/OWFileWithPath.py

@@ -3,20 +3,21 @@ import sys
 
 import Orange.data
 from AnyQt.QtWidgets import QApplication
+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
 if "site-packages/Orange/widgets" in os.path.dirname(os.path.abspath(__file__)).replace("\\", "/"):
-    from Orange.widgets.orangecontrib.AAIT.utils.import_uic import uic
+    from Orange.widgets.orangecontrib.AAIT.utils import base_widget
     from Orange.widgets.orangecontrib.AAIT.utils.initialize_from_ini import apply_modification_from_python_file
 else:
-    from orangecontrib.AAIT.utils.import_uic import uic
+    from orangecontrib.AAIT.utils import base_widget
     from orangecontrib.AAIT.utils.initialize_from_ini import apply_modification_from_python_file
 
 
 @apply_modification_from_python_file(filepath_original_widget=__file__)
-class OWFileWithPath(widget.OWWidget):
+class OWFileWithPath(base_widget.BaseListWidget):
     name = "File with Path"
     category = "AAIT - TOOLBOX"
     description = "Load some tabular data specified with a filepath ('.../data/example.xlsx')."
@@ -27,6 +28,9 @@ class OWFileWithPath(widget.OWWidget):
     want_control_area = False
     priority = 1060
 
+    # Settings
+    selected_column_name = Setting("content")
+
     class Inputs:
         filepath = Input("Path", str, auto_summary=False)
         path_table = Input("Path Table", Orange.data.Table)
@@ -45,20 +49,23 @@ class OWFileWithPath(widget.OWWidget):
 
     @Inputs.path_table
     def set_path_table(self, in_path_table):
-        if in_path_table is not None:
+        self.in_path_table = in_path_table
+        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.")
+        if self.autorun:
+            self.run()
 
 
     def __init__(self):
         super().__init__()
         # Qt Management
-        self.setFixedWidth(470)
-        self.setFixedHeight(300)
-        uic.loadUi(self.gui, self)
+        #uic.loadUi(self.gui, self)
         self.checkbox_interface = self.findChild(QCheckBox, 'checkBox')
         if self.strloadAsString=="False":
             self.checkbox_interface.setChecked(False)
@@ -70,6 +77,7 @@ class OWFileWithPath(widget.OWWidget):
 
         # Data Management
         self.filepath = None
+        self.in_path_table = None
         self.data = None
         self.autorun = True
         self.post_initialized()
@@ -144,6 +152,15 @@ class OWFileWithPath(widget.OWWidget):
             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.strloadAsString!="False":
             out_data = self.load_table_as_strings(self.filepath)
         else:

{aait-2.3.11 → aait-2.3.11.1}/orangecontrib/AAIT/widgets/OWFindFilesFromDir.py

@@ -1,25 +1,23 @@
 import os
 import sys
 import Orange.data
-from AnyQt.QtWidgets import QApplication, QLineEdit, QCheckBox,QSpinBox
+from AnyQt.QtWidgets import QApplication, QLineEdit, QCheckBox,QSpinBox, QPushButton
 from Orange.data import StringVariable, Table, Domain
-from Orange.widgets import widget
 from Orange.widgets.utils.signals import Input, Output
 from Orange.widgets.settings import Setting
 from datetime import datetime, timedelta
 if "site-packages/Orange/widgets" in os.path.dirname(os.path.abspath(__file__)).replace("\\", "/"):
-    from Orange.widgets.orangecontrib.AAIT.utils.import_uic import uic
+    from Orange.widgets.orangecontrib.AAIT.utils import base_widget
     from Orange.widgets.orangecontrib.AAIT.utils.initialize_from_ini import apply_modification_from_python_file
 else:
-    from orangecontrib.AAIT.utils.import_uic import uic
+    from orangecontrib.AAIT.utils import base_widget
     from orangecontrib.AAIT.utils.initialize_from_ini import apply_modification_from_python_file
 
 
 @apply_modification_from_python_file(filepath_original_widget=__file__)
-class OWFileFromDir(widget.OWWidget):
+class OWFileFromDir(base_widget.BaseListWidget):
     name = "Find Files From Dir"
-    description = ("Search files by extension or no for all files in a directory or subdirectories."
-                   "You need a column 'input_dir' of the files.")
+    description = ("Search files by extension or no for all files in a directory or subdirectories.")
     category = "AAIT - TOOLBOX"
     icon = "icons/owfilesfromdir.svg"
     if "site-packages/Orange/widgets" in os.path.dirname(os.path.abspath(__file__)).replace("\\", "/"):
@@ -27,6 +25,7 @@ class OWFileFromDir(widget.OWWidget):
     gui = os.path.join(os.path.dirname(os.path.abspath(__file__)), "designer/owfindfilesfromdir.ui")
     want_control_area = False
     priority = 1060
+    selected_column_name = Setting("input_dir")
     extension = Setting("")
     recursive = Setting("False")
     filter_per_date = Setting("False")
@@ -41,21 +40,21 @@ class OWFileFromDir(widget.OWWidget):
 
     @Inputs.data
     def set_path_table(self, in_data):
-        if in_data is not None:
-            if "input_dir" in in_data.domain:
-                self.folderpath = in_data.get_column("input_dir")
-                self.data = in_data
-                self.run()
-            else:
-                self.warning("You need a 'input_dir' variable from which the data will be loaded.")
+        self.data = in_data
+        if in_data is None:
+            self.Outputs.data.send(None)
+            return
+        if self.data:
+            self.var_selector.add_variables(self.data.domain)
+            self.var_selector.select_variable_by_name(self.selected_column_name)
+        self.run()
 
 
     def __init__(self):
         super().__init__()
         # Qt Management
         self.setFixedWidth(500)
-        self.setFixedHeight(400)
-        uic.loadUi(self.gui, self)
+        self.setFixedHeight(600)
         if self.is_dash_int_castable(self.time_filter)!=0:
             self.time_filter = "0-0-0-1"
 
@@ -104,6 +103,9 @@ class OWFileFromDir(widget.OWWidget):
         self.spinBox_minute.valueChanged.connect(self.on_value_changed)
         self.spinBox_second.valueChanged.connect(self.on_value_changed)
 
+        self.pushButton_run =self.findChild(QPushButton, 'pushButton_send')
+        self.pushButton_run.clicked.connect(self.run)
+
 
     def on_value_changed(self):
         self.time_filter = str(self.spinBox_day.value())+"-"+str(self.spinBox_hour.value())+"-"+str(self.spinBox_minute.value())+"-"+str(self.spinBox_second.value())
@@ -298,13 +300,19 @@ class OWFileFromDir(widget.OWWidget):
     def run(self):
         self.error("")
         self.warning("")
-        if self.folderpath is None:
-            self.error("No input dir in your data")
+        if self.data is None:
+            self.Outputs.data.send(None)
+            return
+
+        if not self.selected_column_name in self.data.domain:
+            self.warning(f'Previously selected column "{self.selected_column_name}" does not exist in your data.')
             return
+
+        self.folderpath = self.data.get_column(self.selected_column_name)
+
         try:
             files_data = self.find_files()
 
-
             if self.filter_per_date !="False":
                 files_data=self.filter_files_newer_than_delta(files_data,self.time_filter)
 
@@ -324,10 +332,10 @@ class OWFileFromDir(widget.OWWidget):
 
 if __name__ == "__main__":
     app = QApplication(sys.argv)
-    # data = Orange.data.Table(r"C:\a_sssssusup\untitled.tab")
+    #data = Orange.data.Table(r"C:\Users\max83\Desktop\data.tab")
     my_widget = OWFileFromDir()
     my_widget.show()
-    # my_widget.set_path_table(data)
+    #my_widget.set_path_table(data)
 
     if hasattr(app, "exec"):
         app.exec()

{aait-2.3.11 → aait-2.3.11.1}/orangecontrib/AAIT/widgets/OWStartLoop.py

@@ -60,13 +60,13 @@ class LoopStartWidget(OWWidget):
         self.checkBox_iteration_on_the_number_of_line.stateChanged.connect(self.updat_checkBox_iteration_on_the_number_of_line)
         self.iter = 0
         self.data = None
-        self.send_pointer()
 
 
     def button_reintialise_action(self):
         self.iter = 0
         dataset = self.data
         self.set_data(dataset)
+        self.send_pointer()
 
     def update_checkBox_iteration_until_number_of_line_dont_change(self):
         if self.checkBox_iteration_until_number_of_line_dont_change.isChecked():
@@ -88,6 +88,7 @@ class LoopStartWidget(OWWidget):
         if dataset is None:
             print("No data received.")
             return
+        self.send_pointer()
         self.error("")
         self.data=None
         if self.str_iterate_still_nb_line_dont_change =="True":

{aait-2.3.11 → aait-2.3.11.1}/orangecontrib/AAIT/widgets/designer/owfilewithpath.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>470</width>
-    <height>300</height>
+    <width>495</width>
+    <height>433</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -19,7 +19,7 @@
      <x>19</x>
      <y>39</y>
      <width>431</width>
-     <height>181</height>
+     <height>111</height>
     </rect>
    </property>
    <property name="title">
@@ -29,7 +29,7 @@
     <property name="geometry">
      <rect>
       <x>20</x>
-      <y>120</y>
+      <y>80</y>
       <width>221</width>
       <height>16</height>
      </rect>
@@ -63,12 +63,12 @@
   </widget>
   <widget class="QPushButton" name="pushButton_send">
    <property name="enabled">
-    <bool>false</bool>
+    <bool>true</bool>
    </property>
    <property name="geometry">
     <rect>
      <x>160</x>
-     <y>234</y>
+     <y>354</y>
      <width>291</width>
      <height>31</height>
     </rect>
@@ -79,20 +79,65 @@
   </widget>
   <widget class="QCheckBox" name="checkBox_send">
    <property name="enabled">
-    <bool>false</bool>
+    <bool>true</bool>
    </property>
    <property name="geometry">
     <rect>
      <x>20</x>
-     <y>240</y>
+     <y>360</y>
      <width>121</width>
-     <height>20</height>
+     <height>21</height>
     </rect>
    </property>
    <property name="text">
     <string>Auto send data</string>
    </property>
   </widget>
+  <widget class="QGroupBox" name="groupBox_3">
+   <property name="geometry">
+    <rect>
+     <x>20</x>
+     <y>180</y>
+     <width>431</width>
+     <height>161</height>
+    </rect>
+   </property>
+   <property name="title">
+    <string>Column selection</string>
+   </property>
+   <widget class="QLabel" name="Description_4">
+    <property name="geometry">
+     <rect>
+      <x>10</x>
+      <y>30</y>
+      <width>411</width>
+      <height>61</height>
+     </rect>
+    </property>
+    <property name="text">
+     <string/>
+    </property>
+    <property name="textFormat">
+     <enum>Qt::AutoText</enum>
+    </property>
+    <property name="alignment">
+     <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+    </property>
+    <property name="wordWrap">
+     <bool>true</bool>
+    </property>
+   </widget>
+   <widget class="QWidget" name="placeholder" native="true">
+    <property name="geometry">
+     <rect>
+      <x>0</x>
+      <y>30</y>
+      <width>431</width>
+      <height>131</height>
+     </rect>
+    </property>
+   </widget>
+  </widget>
  </widget>
  <resources/>
  <connections/>

{aait-2.3.11 → aait-2.3.11.1}/orangecontrib/AAIT/widgets/designer/owfindfilesfromdir.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>480</width>
-    <height>373</height>
+    <width>478</width>
+    <height>563</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -133,14 +133,62 @@
     </property>
    </widget>
   </widget>
+  <widget class="QGroupBox" name="groupBox_3">
+   <property name="geometry">
+    <rect>
+     <x>20</x>
+     <y>330</y>
+     <width>431</width>
+     <height>161</height>
+    </rect>
+   </property>
+   <property name="title">
+    <string>Column selection</string>
+   </property>
+   <widget class="QLabel" name="Description_4">
+    <property name="geometry">
+     <rect>
+      <x>10</x>
+      <y>30</y>
+      <width>411</width>
+      <height>61</height>
+     </rect>
+    </property>
+    <property name="text">
+     <string/>
+    </property>
+    <property name="textFormat">
+     <enum>Qt::AutoText</enum>
+    </property>
+    <property name="alignment">
+     <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+    </property>
+    <property name="wordWrap">
+     <bool>true</bool>
+    </property>
+   </widget>
+   <widget class="QWidget" name="placeholder" native="true">
+    <property name="enabled">
+     <bool>true</bool>
+    </property>
+    <property name="geometry">
+     <rect>
+      <x>0</x>
+      <y>20</y>
+      <width>431</width>
+      <height>141</height>
+     </rect>
+    </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>320</y>
+     <x>149</x>
+     <y>514</y>
      <width>301</width>
      <height>31</height>
     </rect>
@@ -155,10 +203,10 @@
    </property>
    <property name="geometry">
     <rect>
-     <x>30</x>
-     <y>330</y>
-     <width>121</width>
-     <height>20</height>
+     <x>20</x>
+     <y>520</y>
+     <width>131</width>
+     <height>16</height>
     </rect>
    </property>
    <property name="text">

{aait-2.3.11 → aait-2.3.11.1}/setup.py

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