io4it 2.1.8.4__tar.gz → 2.1.8.5__tar.gz

{io4it-2.1.8.4 → io4it-2.1.8.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: io4it
-Version: 2.1.8.4
+Version: 2.1.8.5
 Home-page: 
 Author: 
 Author-email: 

{io4it-2.1.8.4 → io4it-2.1.8.5}/io4it.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: io4it
-Version: 2.1.8.4
+Version: 2.1.8.5
 Home-page: 
 Author: 
 Author-email: 

{io4it-2.1.8.4 → io4it-2.1.8.5}/orangecontrib/IO4IT/utils/offuscation_basique.py

@@ -10,7 +10,7 @@ if "site-packages/Orange/widgets" in os.path.dirname(os.path.abspath(__file__)).
     from Orange.widgets.orangecontrib.IO4IT.utils import secret_manager
 else:
     from orangecontrib.AAIT.utils import MetManagement
-    from orangecontrib.AAIT.utils import secret_manager
+    from orangecontrib.IO4IT.utils import secret_manager
 
 
 #  FONCTIOSN D'OBFUSCATION GÉNÉRALES & CHEMIN

{io4it-2.1.8.4 → io4it-2.1.8.5}/orangecontrib/IO4IT/widgets/OWMD2HTML.py

@@ -1,12 +1,11 @@
 import os
 import sys
-import numpy as np
 
 import markdown
 import html2text
 
 import Orange.data
-from Orange.data import StringVariable, Domain, Table
+from Orange.data import StringVariable
 from AnyQt.QtWidgets import QApplication
 from Orange.widgets.settings import Setting
 from Orange.widgets.utils.signals import Input, Output

{io4it-2.1.8.4 → io4it-2.1.8.5}/orangecontrib/IO4IT/widgets/OWParserHTML.py

@@ -1,9 +1,8 @@
 import os
 import sys
-from Orange.data import Table, StringVariable
 import Orange
 from Orange.widgets.widget import OWWidget, Input, Output
-from AnyQt.QtWidgets import QApplication, QLineEdit, QSpinBox, QDoubleSpinBox, QPushButton
+from AnyQt.QtWidgets import QApplication
 import asyncio
 import aiohttp
 import html2text

{io4it-2.1.8.4 → io4it-2.1.8.5}/orangecontrib/IO4IT/widgets/OWWebSearch.py

@@ -3,24 +3,21 @@ from typing import List, Dict
 from duckduckgo_search import DDGS
 import os
 import sys
-from Orange.data import Table
 import Orange
-from Orange.widgets.widget import OWWidget, Input, Output
-from AnyQt.QtWidgets import QApplication, QLineEdit, QSpinBox, QDoubleSpinBox, QPushButton
+from Orange.widgets.widget import Input, Output
+from AnyQt.QtWidgets import QApplication, QPushButton
 import json
 
 if "site-packages/Orange/widgets" in os.path.dirname(os.path.abspath(__file__)).replace("\\", "/"):
-    from Orange.widgets.orangecontrib.AAIT.utils import thread_management
-    from Orange.widgets.orangecontrib.AAIT.utils.import_uic import uic
+    from Orange.widgets.orangecontrib.AAIT.utils import thread_management, base_widget
     from Orange.widgets.orangecontrib.HLIT_dev.remote_server_smb import convert
 else:
-    from orangecontrib.AAIT.utils.import_uic import uic
-    from orangecontrib.AAIT.utils import thread_management
+    from orangecontrib.AAIT.utils import thread_management, base_widget
     from orangecontrib.HLIT_dev.remote_server_smb import convert
 
-class WebSearch(OWWidget):
+class WebSearch(base_widget.BaseListWidget):
     name = "WebSearch"
-    description = "Search url website from a query with DDG. You need to provide query column in input."
+    description = "Search url website from a query with DDG."
     icon = "icons/websearch.png"
     if "site-packages/Orange/widgets" in os.path.dirname(os.path.abspath(__file__)).replace("\\", "/"):
         icon = "icons_dev/websearch.png"
@@ -35,13 +32,12 @@ class WebSearch(OWWidget):
 
     @Inputs.data
     def set_data(self, in_data):
+        self.data = in_data
         if in_data is None:
             return
-        if "query" not in in_data.domain:
-            self.error("input table need a query column")
-            return
-        self.data = in_data
-        self.query = in_data.get_column("query")[0]
+        if self.data:
+            self.var_selector.add_variables(self.data.domain)
+            self.var_selector.select_variable_by_name(self.selected_column_name)
         self.run()
 
     class Outputs:
@@ -52,14 +48,18 @@ class WebSearch(OWWidget):
         super().__init__()
         # Qt Management
         self.setFixedWidth(500)
-        self.setFixedHeight(400)
-        uic.loadUi(self.gui, self)
+        self.setFixedHeight(500)
 
         self.max_results = 20
         self.region = 'fr-fr'
         self.time_range = 'y'
         self.relevance_threshold = 0.3
 
+        self.pushButton_run =self.findChild(QPushButton, 'pushButton_send')
+        self.pushButton_run.clicked.connect(self.run)
+        self.load_config()
+
+    def load_config(self):
         config_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), "../utils/config.json")
         with open(config_path, "r", encoding="utf-8") as f:
             config = json.load(f)
@@ -262,6 +262,13 @@ class WebSearch(OWWidget):
         self.warning("")
         if self.data is 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.query = self.data.get_column(self.selected_column_name)[0]
+
         self.progressBarInit()
         self.thread = thread_management.Thread(self.search)
         self.thread.progress.connect(self.handle_progress)

{io4it-2.1.8.4 → io4it-2.1.8.5}/orangecontrib/IO4IT/widgets/OWmailLoader.py

@@ -6,6 +6,7 @@ from AnyQt.QtWidgets import QApplication
 from Orange.widgets import widget
 from Orange.widgets.utils.signals import Input, Output
 import re
+import html2text
 
 if "site-packages/Orange/widgets" in os.path.dirname(os.path.abspath(__file__)).replace("\\", "/"):
     from Orange.widgets.orangecontrib.AAIT.utils.import_uic import uic
@@ -121,6 +122,40 @@ class OWMailLoader(widget.OWWidget):
         self.Outputs.data_out_nothing_to_do.send(data_table)
         self.Outputs.data.send(None)
 
+    def html_to_markdown_if_needed(self,contenu_txt: str) -> str:
+        """
+        pas sur que ca fasse reellement du markdown !!!
+        Si contenu_txt contient du HTML, convertit en Markdown à l'aide de html2text.
+        Gère l'encodage UTF-8 si nécessaire.
+        """
+        if not contenu_txt:
+            return ""
+
+        # S'assurer que le texte est bien en str UTF-8
+        if isinstance(contenu_txt, bytes):
+            try:
+                contenu_txt = contenu_txt.decode("utf-8", errors="replace")
+            except Exception:
+                contenu_txt = contenu_txt.decode("latin-1", errors="replace")
+
+        # Détection rudimentaire de HTML
+        if re.search(r"<(html|p|div|span|br|a|img|h\d|ul|ol|li|table|tr|td|th)[\s>]", contenu_txt, re.IGNORECASE):
+            try:
+                # Conversion HTML → Markdown
+                converter = html2text.HTML2Text()
+                converter.ignore_links = False
+                converter.ignore_images = False
+                converter.body_width = 0  # ne coupe pas les lignes
+                md = converter.handle(contenu_txt)
+                # Nettoyage UTF-8 et espaces
+                return md.strip()
+            except Exception as e:
+                print(f"[⚠️] Erreur conversion HTML→Markdown : {e}")
+                return contenu_txt
+        else:
+            # Pas de HTML détecté
+            return contenu_txt
+
     def lire_fichier_txt_mail_and_parse(self,nom_du_fichier):
         try:
             # vba enregistre en ansi
@@ -139,7 +174,7 @@ class OWMailLoader(widget.OWWidget):
         entete = split_txt[0]
         # Partie après #$txt (le contenu complet du champ txt)
         contenu_txt = split_txt[1] if len(split_txt) > 1 else ""
-
+        contenu_txt=self.html_to_markdown_if_needed(contenu_txt)
         # Utilisation d'une expression régulière pour trouver toutes les lignes commençant par '#$'
         pattern = r'^\#\$(.+?) : (.*)$'
 

{io4it-2.1.8.4 → io4it-2.1.8.5}/orangecontrib/IO4IT/widgets/designer/owwebsearch.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>471</width>
-    <height>344</height>
+    <height>474</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -50,12 +50,12 @@
   </widget>
   <widget class="QPushButton" name="pushButton_send">
    <property name="enabled">
-    <bool>false</bool>
+    <bool>true</bool>
    </property>
    <property name="geometry">
     <rect>
      <x>149</x>
-     <y>274</y>
+     <y>430</y>
      <width>301</width>
      <height>31</height>
     </rect>
@@ -71,7 +71,7 @@
    <property name="geometry">
     <rect>
      <x>20</x>
-     <y>280</y>
+     <y>436</y>
      <width>131</width>
      <height>16</height>
     </rect>
@@ -84,7 +84,7 @@
    <property name="geometry">
     <rect>
      <x>20</x>
-     <y>140</y>
+     <y>130</y>
      <width>431</width>
      <height>101</height>
     </rect>
@@ -193,6 +193,51 @@
     </property>
    </widget>
   </widget>
+  <widget class="QGroupBox" name="groupBox_3">
+   <property name="geometry">
+    <rect>
+     <x>20</x>
+     <y>250</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>20</y>
+      <width>431</width>
+      <height>141</height>
+     </rect>
+    </property>
+   </widget>
+  </widget>
  </widget>
  <resources/>
  <connections/>

{io4it-2.1.8.4 → io4it-2.1.8.5}/setup.py

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