aait 2.3.10.1__tar.gz → 2.3.11__tar.gz

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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aait
-Version: 2.3.10.1
+Version: 2.3.11
 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.10.1 → aait-2.3.11}/orangecontrib/AAIT/widgets/OWFileSyncChecker.py

@@ -61,7 +61,7 @@ class OWFileSyncChecker(widget.OWWidget):
 
         # Data Management
         self.data = None
-        self.reference = "default"
+        self.reference = None
         self.autorun = True
         self.thread = None
         self.result = None
@@ -77,13 +77,6 @@ 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:
@@ -147,8 +140,6 @@ 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:
@@ -168,9 +159,6 @@ 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())
 
@@ -192,21 +180,13 @@ 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]
@@ -221,8 +201,6 @@ class OWFileSyncChecker(widget.OWWidget):
             except Exception:
                 pass
 
-        progress_update(100, progress_callback)
-
         # ---- Build output table ----
         path_var = StringVariable("path")
         size_var = ContinuousVariable("file size")
@@ -242,8 +220,6 @@ 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)
@@ -257,12 +233,6 @@ 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.10.1 → aait-2.3.11}/orangecontrib/AAIT/widgets/OWFindFilesFromDir.py

@@ -1,23 +1,25 @@
 import os
 import sys
 import Orange.data
-from AnyQt.QtWidgets import QApplication, QLineEdit, QCheckBox,QSpinBox, QPushButton
+from AnyQt.QtWidgets import QApplication, QLineEdit, QCheckBox,QSpinBox
 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 base_widget
+    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.AAIT.utils import base_widget
+    from orangecontrib.AAIT.utils.import_uic import uic
     from orangecontrib.AAIT.utils.initialize_from_ini import apply_modification_from_python_file
 
 
 @apply_modification_from_python_file(filepath_original_widget=__file__)
-class OWFileFromDir(base_widget.BaseListWidget):
+class OWFileFromDir(widget.OWWidget):
     name = "Find Files From Dir"
-    description = ("Search files by extension or no for all files in a directory or subdirectories.")
+    description = ("Search files by extension or no for all files in a directory or subdirectories."
+                   "You need a column 'input_dir' of the files.")
     category = "AAIT - TOOLBOX"
     icon = "icons/owfilesfromdir.svg"
     if "site-packages/Orange/widgets" in os.path.dirname(os.path.abspath(__file__)).replace("\\", "/"):
@@ -25,7 +27,6 @@ class OWFileFromDir(base_widget.BaseListWidget):
     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")
@@ -40,21 +41,21 @@ class OWFileFromDir(base_widget.BaseListWidget):
 
     @Inputs.data
     def set_path_table(self, in_data):
-        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()
+        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.")
 
 
     def __init__(self):
         super().__init__()
         # Qt Management
         self.setFixedWidth(500)
-        self.setFixedHeight(600)
+        self.setFixedHeight(400)
+        uic.loadUi(self.gui, self)
         if self.is_dash_int_castable(self.time_filter)!=0:
             self.time_filter = "0-0-0-1"
 
@@ -103,9 +104,6 @@ class OWFileFromDir(base_widget.BaseListWidget):
         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())
@@ -300,19 +298,13 @@ class OWFileFromDir(base_widget.BaseListWidget):
     def run(self):
         self.error("")
         self.warning("")
-        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.')
+        if self.folderpath is None:
+            self.error("No input dir 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)
 
@@ -332,10 +324,10 @@ class OWFileFromDir(base_widget.BaseListWidget):
 
 if __name__ == "__main__":
     app = QApplication(sys.argv)
-    #data = Orange.data.Table(r"C:\Users\max83\Desktop\data.tab")
+    # data = Orange.data.Table(r"C:\a_sssssusup\untitled.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.10.1 → aait-2.3.11}/orangecontrib/AAIT/widgets/OWSelectRowsDynamic.py

@@ -121,12 +121,12 @@ class OWSelectRowsDynamic(widget.OWWidget):
         if matching_rows:
             matched_table = Orange.data.Table(self.in_data.domain, matching_rows)
         else:
-            matched_table = Orange.data.Table(None)
+            matched_table = None
 
         if non_matching_rows:
             unmatched_table = Orange.data.Table(self.in_data.domain, non_matching_rows)
         else:
-            unmatched_table = Orange.data.Table(None)
+            unmatched_table = None
 
         # Sauvegarder les résultats dans l'objet widget si besoin
         self.Outputs.data_matching.send(matched_table)

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

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>478</width>
-    <height>563</height>
+    <width>480</width>
+    <height>373</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -133,62 +133,14 @@
     </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>true</bool>
+    <bool>false</bool>
    </property>
    <property name="geometry">
     <rect>
-     <x>149</x>
-     <y>514</y>
+     <x>170</x>
+     <y>320</y>
      <width>301</width>
      <height>31</height>
     </rect>
@@ -203,10 +155,10 @@
    </property>
    <property name="geometry">
     <rect>
-     <x>20</x>
-     <y>520</y>
-     <width>131</width>
-     <height>16</height>
+     <x>30</x>
+     <y>330</y>
+     <width>121</width>
+     <height>20</height>
     </rect>
    </property>
    <property name="text">

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

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