aait 2.1.0__tar.gz → 2.1.2__tar.gz

{aait-2.1.0 → aait-2.1.2}/PKG-INFO

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

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

@@ -174,6 +174,7 @@ orangecontrib/AAIT/widgets/designer/ownumberpointinrules.ui
 orangecontrib/AAIT/widgets/designer/owprocessdocuments.ui
 orangecontrib/AAIT/widgets/designer/owqueryllm.ui
 orangecontrib/AAIT/widgets/designer/owreranking.ui
+orangecontrib/AAIT/widgets/designer/owsavewithpath.ui
 orangecontrib/AAIT/widgets/designer/owselect_row_dynamic.ui
 orangecontrib/AAIT/widgets/designer/owstartloop.ui
 orangecontrib/AAIT/widgets/designer/owtable2corpus.ui

{aait-2.1.0 → aait-2.1.2}/orangecontrib/AAIT/widgets/OWAddColumns.py

@@ -133,7 +133,7 @@ class OWAddColumns(widget.OWWidget):
         keys = [
             "OS", "Machine", "Processor",
             "Python Version", "Python Executable", "Orange3",
-            "Time"
+            "Current Time",  "Row number"
         ]
         vals = [
             platform.platform(),
@@ -217,7 +217,11 @@ class OWAddColumns(widget.OWWidget):
         left = data.metas if (data.metas is not None and data.metas.size) else np.empty((n, len(existing_meta_vars)), dtype=object)
         right = np.empty((n, len(new_meta_vars)), dtype=object)
         for j, k in enumerate(selected_keys):
-            right[:, j] = kv.get(k, "")
+            if k == "Row number":
+                # Numérotation humaine 1..N (met en 0..N-1 si tu préfères)
+                right[:, j] = np.arange(1, n + 1).astype(object)
+            else:
+                right[:, j] = kv.get(k, "")
 
         metas = np.hstack([left, right]) if left.size else right
 

{aait-2.1.0 → aait-2.1.2}/orangecontrib/AAIT/widgets/OWEndLoop.py

@@ -40,6 +40,16 @@ class EndLoopWidget(OWWidget):
 
         self.data = data
 
+        # cas ou on boucle temps que le nombre de ligne augmente
+        if "True"==self.get_is_allow_to_change_line_number_from_start():
+            print("autorise a changer de ligne")
+            if self.get_nb_line() == self.get_nb_line_from_start():
+                # on s'arrete
+                self.Outputs.out_data.send(self.data)
+                return
+            # on boucle
+            ctypes.cast(int(self.in_pointer), ctypes.py_object).value.set_data(self.data)
+            return
 
         # Check if the number of lines has changed
         if self.get_nb_line() != self.get_nb_line_from_start():
@@ -127,6 +137,13 @@ class EndLoopWidget(OWWidget):
             result = ctypes.cast(int(self.in_pointer), ctypes.py_object).value.get_nb_line()
         return result
 
+    def get_is_allow_to_change_line_number_from_start(self):
+        result = "False"
+        if self.in_pointer is not None:
+            result = ctypes.cast(int(self.in_pointer), ctypes.py_object).value.is_allow_to_change_line_number()
+        return result
+
+
     def get_nb_line(self):
         # Return the number of lines to compare with another widget
         if self.data is None:

aait-2.1.2/orangecontrib/AAIT/widgets/OWFileWithPath.py

@@ -0,0 +1,165 @@
+import os
+import sys
+import math
+
+import Orange.data
+from AnyQt.QtWidgets import QApplication
+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.initialize_from_ini import apply_modification_from_python_file
+else:
+    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 OWFileWithPath(widget.OWWidget):
+    name = "File with Path"
+    category = "AAIT - TOOLBOX"
+    description = "Load some tabular data specified with a filepath ('.../data/example.xlsx')."
+    icon = "icons/owfilewithpath.svg"
+    if "site-packages/Orange/widgets" in os.path.dirname(os.path.abspath(__file__)).replace("\\", "/"):
+        icon = "icons_dev/owfilewithpath.svg"
+    gui = os.path.join(os.path.dirname(os.path.abspath(__file__)), "designer/owfilewithpath.ui")
+    want_control_area = False
+    priority = 1060
+
+    class Inputs:
+        filepath = Input("Path", str, auto_summary=False)
+        path_table = Input("Path Table", Orange.data.Table)
+
+    class Outputs:
+        data = Output("Data", Orange.data.Table)
+
+    strloadAsString: str = Setting('False')
+
+
+    @Inputs.filepath
+    def set_filepath(self, in_filepath):
+        if in_filepath is not None:
+            self.filepath = in_filepath
+            self.run()
+
+    @Inputs.path_table
+    def set_path_table(self, in_path_table):
+        if in_path_table is not None:
+            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.")
+
+
+    def __init__(self):
+        super().__init__()
+        # Qt Management
+        self.setFixedWidth(470)
+        self.setFixedHeight(300)
+        uic.loadUi(self.gui, self)
+        self.checkbox_interface = self.findChild(QCheckBox, 'checkBox')
+        if self.strloadAsString=="False":
+            self.checkbox_interface.setChecked(False)
+        else:
+            self.checkbox_interface.setChecked(True)
+        self.checkbox_interface.stateChanged.connect(self.on_checkbox_toggled)
+
+
+
+        # Data Management
+        self.filepath = None
+        self.data = None
+        self.autorun = True
+        self.post_initialized()
+    def on_checkbox_toggled(self):
+        if self.checkbox_interface.isChecked():
+            self.strloadAsString="True"
+        else:
+            self.strloadAsString="False"
+
+    def safe_repr_val(self,var, val, missing_as_empty=False):
+        """
+        Version robuste de var.repr_val(val) :
+        - gère les valeurs NaN/Inf
+        - gère les erreurs de datetime.fromtimestamp (OSError invalid argument)
+        """
+        try:
+            if var.is_string:
+                s = var.str_val(val)  # pas de guillemets
+            else:
+                s = var.repr_val(val)
+            if missing_as_empty and s == "?":
+                return ""
+            return s
+        except (ValueError, OverflowError, OSError):
+            # cas des TimeVariable avec timestamp invalide
+            return "" if missing_as_empty else "?"
+
+    def load_table_as_strings(self,filepath: str) -> Orange.data.Table:
+        """
+        Charge un fichier Orange et renvoie un Table où toutes les colonnes
+        (features, class, metas) sont converties en StringVariable et placées en metas.
+        """
+        missing_as_empty=False # si on passe a True on met "" à la place de ?
+        t = Orange.data.Table.from_file(filepath)
+        dom = t.domain
+
+        # 2) Toutes les variables d'origine
+        all_vars = list(dom.attributes) + list(dom.class_vars) + list(dom.metas)
+
+        # 3) Créer des StringVariable correspondantes
+        new_metas = tuple(Orange.data.StringVariable(v.name) for v in all_vars)
+
+        # 4) Domaine final : que des metas
+        new_domain = Orange.data.Domain([], None, new_metas)
+
+        # 5) Créer table vide
+        t_str = Orange.data.Table.from_domain(new_domain, len(t))
+
+        # 6) Remplissage sécurisé
+        for j, src_var in enumerate(all_vars):
+            col_data = t.get_column(src_var)
+            text_vals = [self.safe_repr_val(src_var, v, missing_as_empty) for v in col_data]
+            t_str.metas[:, j] = text_vals
+
+        # 7) Métadonnées
+        t_str.name = t.name
+        t_str.ids = t.ids
+        t_str.attributes = dict(getattr(t, "attributes", {}))
+
+        return t_str
+    def run(self):
+        self.error("")
+        self.warning("")
+
+        if self.filepath is None:
+            return
+
+        #try:
+        self.filepath = self.filepath.strip('"')
+
+        if self.strloadAsString!="False":
+            out_data = self.load_table_as_strings(self.filepath)
+        else:
+         out_data = Orange.data.Table.from_file(self.filepath)
+        out_data.name = self.filepath
+        #except Exception as e:
+        #    self.error(f"An error occurred: the provided file path may not be supported ({e})")
+        #    return
+
+        self.Outputs.data.send(out_data)
+
+    def post_initialized(self):
+        pass
+
+if __name__ == "__main__":
+    app = QApplication(sys.argv)
+    my_widget = OWFileWithPath()
+    my_widget.show()
+    if hasattr(app, "exec"):
+        app.exec()
+    else:
+        app.exec_()

{aait-2.1.0 → aait-2.1.2}/orangecontrib/AAIT/widgets/OWSaveFilepathEntry.py

@@ -1,11 +1,18 @@
 import os
 import json
 import ast
-from Orange.widgets import gui, widget
+from Orange.widgets import  widget
 from Orange.widgets.settings import Setting
 from Orange.widgets.utils.widgetpreview import WidgetPreview
 from Orange.widgets.widget import Input, Output
 from Orange.data import Table
+from AnyQt.QtWidgets import QCheckBox
+import copy
+
+if "site-packages/Orange/widgets" in os.path.dirname(os.path.abspath(__file__)).replace("\\", "/"):
+    from Orange.widgets.orangecontrib.AAIT.utils.import_uic import uic
+else:
+    from orangecontrib.AAIT.utils.import_uic import uic
 
 class OWSaveFilepathEntry(widget.OWWidget):
     name = "Save with Filepath Entry"
@@ -14,16 +21,19 @@ class OWSaveFilepathEntry(widget.OWWidget):
     icon = "icons/owsavefilepathentry.svg"
     if "site-packages/Orange/widgets" in os.path.dirname(os.path.abspath(__file__)).replace("\\", "/"):
         icon = "icons_dev/owsavefilepathentry.svg"
+    gui = os.path.join(os.path.dirname(os.path.abspath(__file__)), "designer/owsavewithpath.ui")
     priority = 1220
-    want_main_area = False
-    resizing_enabled = False
+    want_control_area = False
 
     # Persistent settings for fileId and CSV delimiter
-    filename: str = Setting("embeddings.pkl") # type: ignore
+    filename: str = Setting("embeddings.pkl")
+    annotations: bool = Setting(True)
+    purge_widget: bool = Setting(False)
+
 
     class Inputs:
         data = Input("Data", Table)
-        save_path = Input("Path", str)
+        save_path = Input("Path", str, auto_summary=False)
         path_table = Input("Path Table", Table)
 
     class Outputs:
@@ -32,44 +42,59 @@ class OWSaveFilepathEntry(widget.OWWidget):
     @Inputs.data
     def dataset(self, data): 
         """Handle new data input."""
+        if data is None:
+            self.data=None
+            return
         self.data = data
-        if self.data is not None:
-            self.run()
+        self.run()
+
 
     @Inputs.save_path
     def set_save_path(self, in_save_path):
-        if in_save_path is not None:
-            self.save_path = in_save_path.replace('"', '')
-            self.run()
+        if in_save_path is None:
+            self.save_path=None
+            return
+        self.save_path = in_save_path.replace('"', '')
+        self.json = False
+        if self.save_path.endswith(".json"):
+            self.json = True
+        self.run()
 
     @Inputs.path_table
     def set_path_table(self, in_path_table):
-        if in_path_table is not None:
-            #pour enregistrement en json
-            if "path" in in_path_table.domain:
-                if in_path_table[0]["path"].value.endswith(".json"):
-                    self.json = True
+        if in_path_table is None:
+            self.save_path=None
+            return
+        self.json = False
+        if "path" in in_path_table.domain:
+            if in_path_table[0]["path"].value.endswith(".json"):
+                self.json = True
+            self.save_path = in_path_table[0]["path"].value.replace('"', '')
+            self.run()
 
-            if "path" in in_path_table.domain:
-                self.save_path = in_path_table[0]["path"].value.replace('"', '')
-                self.run()
 
     def __init__(self):
         super().__init__()
-        self.info_label = gui.label(self.controlArea, self, "Initial info.")
-
+        # Qt Management
+        self.setFixedWidth(470)
+        self.setFixedHeight(300)
+        uic.loadUi(self.gui, self)
+        self.checkbox_annotations = self.findChild(QCheckBox, 'checkBox')
+        self.checkBox_2 = self.findChild(QCheckBox,'checkBox_2')
+
+        self.checkbox_annotations.setChecked(self.annotations)
+        self.checkBox_2.setChecked(self.purge_widget)
+        self.checkbox_annotations.stateChanged.connect(self.update_parameters)
+        self.checkBox_2.stateChanged.connect(self.update_parameters)
         # Data Management
         self.save_path = None
         self.data = None
         self.json = False
-        self.setup_ui()
 
-
-    def setup_ui(self):
-        """Set up the user interface."""
-        # Qt Management
-        self.setFixedWidth(470)
-        self.setFixedHeight(300)
+    def update_parameters(self):
+        self.annotations = self.checkbox_annotations.isChecked()
+        self.purge_widget=self.checkBox_2.isChecked()
+        self.run()
 
     def save_file(self):
         self.error("")
@@ -79,6 +104,7 @@ class OWSaveFilepathEntry(widget.OWWidget):
 
         import Orange.widgets.data.owsave as save_py
         saver = save_py.OWSave()
+        saver.add_type_annotations = self.annotations
         filters = saver.valid_filters()
         extension = os.path.splitext(self.save_path)[1]
         selected_filter = ""
@@ -94,8 +120,7 @@ class OWSaveFilepathEntry(widget.OWWidget):
         saver.filter = selected_filter
         saver.do_save()
         self.Outputs.data.send(self.data)
-        self.data = None
-        self.save_path = None
+
 
     def save_json(self):
         if "content" not in self.data.domain:
@@ -121,8 +146,6 @@ class OWSaveFilepathEntry(widget.OWWidget):
             with open(folder_path, "w", encoding="utf-8") as f:
                 json.dump(data_raw, f, ensure_ascii=False, indent=4)
         self.information("JSON saved successfully")
-        self.json = False
-        self.save_path = None
         self.Outputs.data.send(self.data)
 
     def run(self):
@@ -130,16 +153,24 @@ class OWSaveFilepathEntry(widget.OWWidget):
         self.information("")
         """Save data to a file."""
         if self.data is None:
+            self.error("need data")
             return
-
         if self.save_path is None:
+            self.error("need path")
             return
-
         if self.json:
             self.save_json()
         else:
             self.save_file()
 
+        if self.purge_widget:
+            self.save_path = None
+        to_send=copy.deepcopy(self.data)
+        if self.purge_widget:
+            self.data = None
+
+        self.Outputs.data.send(to_send)
+
 
 
 

{aait-2.1.0 → aait-2.1.2}/orangecontrib/AAIT/widgets/OWSelectRowsDynamic.py

@@ -8,10 +8,10 @@ from Orange.widgets.utils.signals import Input, Output
 
 
 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_uic import uic
     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_uic import uic
     from orangecontrib.AAIT.utils.initialize_from_ini import apply_modification_from_python_file
 
 

{aait-2.1.0 → aait-2.1.2}/orangecontrib/AAIT/widgets/OWStartLoop.py

@@ -5,6 +5,9 @@ from Orange.data import Domain, Table,  ContinuousVariable
 from Orange.widgets.utils.signals import Input
 from Orange.widgets.widget import Output, OWWidget
 import numpy as np
+from Orange.widgets.settings import Setting
+from AnyQt.QtWidgets import QCheckBox
+
 
 if "site-packages/Orange/widgets" in os.path.dirname(os.path.abspath(__file__)).replace("\\", "/"):
     from Orange.widgets.orangecontrib.AAIT.utils.import_uic import uic
@@ -22,7 +25,7 @@ class LoopStartWidget(OWWidget):
     gui = os.path.join(os.path.dirname(os.path.abspath(__file__)), "designer/owstartloop.ui")
     want_control_area = False
     priority = 1010
-
+    str_iterate_still_nb_line_dont_change: str = Setting("False")
     class Inputs:
         data_in = Input("Data In", Orange.data.Table)
         # in_pointer = Input("End of the Loop Do-While", str, auto_summary=False)
@@ -37,10 +40,25 @@ class LoopStartWidget(OWWidget):
         self.setFixedWidth(470)
         self.setFixedHeight(300)
         uic.loadUi(self.gui, self)
+        self.checkBox_iteration_until_number_of_line_dont_change = self.findChild(QCheckBox, 'checkBox')
+        if self.str_iterate_still_nb_line_dont_change !="False":
+            self.checkBox_iteration_until_number_of_line_dont_change.setChecked(True)
+        else:
+            self.checkBox_iteration_until_number_of_line_dont_change.setChecked(False)
+        self.checkBox_iteration_until_number_of_line_dont_change.stateChanged.connect(self.update_checkBox_iteration_until_number_of_line_dont_change)
+
+
         self.data = None
         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():
+            self.str_iterate_still_nb_line_dont_change="True"
+        else:
+            self.str_iterate_still_nb_line_dont_change = "False"
+
+
     @Inputs.data_in
     def set_data(self, dataset):
         if dataset is None:
@@ -48,6 +66,10 @@ class LoopStartWidget(OWWidget):
             return
         self.error("")
         self.data=None
+        if self.str_iterate_still_nb_line_dont_change =="True":
+            self.data=dataset
+            self.process_data()
+            return
         error_code_check_iter_column=self.check_iter_column(dataset)
         if error_code_check_iter_column==1:
             print("add iter column")
@@ -93,6 +115,9 @@ class LoopStartWidget(OWWidget):
     def get_nb_line(self):
         """Return the number of lines to be called from another widget."""
         return 0 if self.data is None else len(self.data)
+    def is_allow_to_change_line_number(self):
+        """Return if we are allowed to change the number of line to be called from another widget."""
+        return self.str_iterate_still_nb_line_dont_change
 
     def get_column_name_and_type(self):
         """Return the name and type of 'data_in' to be called from another widget."""

{aait-2.1.0 → aait-2.1.2}/orangecontrib/AAIT/widgets/designer/owfilewithpath.ui

@@ -17,13 +17,13 @@
    <property name="geometry">
     <rect>
      <x>20</x>
-     <y>20</y>
+     <y>10</y>
      <width>431</width>
-     <height>261</height>
+     <height>91</height>
     </rect>
    </property>
    <property name="text">
-    <string>This widget loads some tabular data specified with a filepath (such as ".../data/example.xlsx").</string>
+    <string>This widget loads some tabular data specified with a filepath (such as &quot;.../data/example.xlsx&quot;).</string>
    </property>
    <property name="textFormat">
     <enum>Qt::AutoText</enum>
@@ -35,6 +35,19 @@
     <bool>true</bool>
    </property>
   </widget>
+  <widget class="QCheckBox" name="checkBox">
+   <property name="geometry">
+    <rect>
+     <x>30</x>
+     <y>110</y>
+     <width>221</width>
+     <height>16</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>Load content as StringVariable</string>
+   </property>
+  </widget>
  </widget>
  <resources/>
  <connections/>

aait-2.1.2/orangecontrib/AAIT/widgets/designer/owsavewithpath.ui

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Form</class>
+ <widget class="QWidget" name="Form">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>404</width>
+    <height>238</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <widget class="QCheckBox" name="checkBox">
+   <property name="geometry">
+    <rect>
+     <x>24</x>
+     <y>80</y>
+     <width>371</width>
+     <height>31</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>Add type annotations</string>
+   </property>
+  </widget>
+  <widget class="QCheckBox" name="checkBox_2">
+   <property name="geometry">
+    <rect>
+     <x>20</x>
+     <y>120</y>
+     <width>221</width>
+     <height>31</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>purge widget entries after writing the file</string>
+   </property>
+  </widget>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

{aait-2.1.0 → aait-2.1.2}/orangecontrib/AAIT/widgets/designer/owstartloop.ui

@@ -35,6 +35,19 @@
     <bool>true</bool>
    </property>
   </widget>
+  <widget class="QCheckBox" name="checkBox">
+   <property name="geometry">
+    <rect>
+     <x>20</x>
+     <y>210</y>
+     <width>431</width>
+     <height>16</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>Loop over the number of lines until it stops changing</string>
+   </property>
+  </widget>
  </widget>
  <resources/>
  <connections/>

{aait-2.1.0 → aait-2.1.2}/setup.py

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