PyPI - TimeFeatures - Versions diffs - 1.0.11__tar.gz → 1.0.13__tar.gz - Mend

TimeFeatures 1.0.11tar.gz → 1.0.13tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (18) hide show

{TimeFeatures-1.0.11 → TimeFeatures-1.0.13}/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: TimeFeatures
-Version: 1.0.11
+Version: 1.0.13
 Summary: Timefeatures add-on for Orange 3 data mining software.
 Home-page: https://github.com/alervgr/Orange-TimeFeatures
 Author: Alejandro Rivas García

{TimeFeatures-1.0.11 → TimeFeatures-1.0.13}/TimeFeatures.egg-info/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: TimeFeatures
-Version: 1.0.11
+Version: 1.0.13
 Summary: Timefeatures add-on for Orange 3 data mining software.
 Home-page: https://github.com/alervgr/Orange-TimeFeatures
 Author: Alejandro Rivas García

{TimeFeatures-1.0.11 → TimeFeatures-1.0.13}/setup.py RENAMED Viewed

@@ -21,7 +21,7 @@ setup(name="TimeFeatures",
       packages=["timefeatures.widgets"],
       package_data={"timefeatures.widgets": ["icons/*.svg", "icons/*.png"]},
       entry_points={"orange.widgets": "Time-Features = timefeatures.widgets"},
-      version="1.0.11",
+      version="1.0.13",
       author="Alejandro Rivas García",
       author_email="alejandrorivasgarcia@gmail.com",
       keywords=[

{TimeFeatures-1.0.11 → TimeFeatures-1.0.13}/timefeatures/widgets/owsavetodb.py RENAMED Viewed

@@ -19,6 +19,12 @@ from PyQt5.QtGui import QPixmap, QStandardItem
 from PyQt5.QtWidgets import QGridLayout, QLineEdit, QPushButton, QSizePolicy, QLabel
 from orangewidget.utils.signals import Input
+import re
+import smtplib, ssl, time
+from email.mime.text import MIMEText
+from email.mime.multipart import MIMEMultipart
 MAX_DL_LIMIT = 1000000
@@ -131,6 +137,9 @@ class owsavetodb(OWBaseSql, OWWidget):
         self.cols_label = QLabel()
         self.cols_label.setText("Columns: 0")
         layoutA.addWidget(self.cols_label, 2, 0)
+        self.emailDirection = QLineEdit(
+            placeholderText="Email... (Optional)", toolTip="Email direction")
+        layoutA.addWidget(self.emailDirection, 4, 0)
         self.tableName = QLineEdit(
             placeholderText="Table name...", toolTip="Table name")
         layoutA.addWidget(self.tableName, 3, 0)
@@ -140,7 +149,7 @@ class owsavetodb(OWBaseSql, OWWidget):
         )
         self.btn_savedata.clicked.connect(self.saveData)
         self.btn_savedata.setEnabled(False)
-        layoutA.addWidget(self.btn_savedata, 3, 2)
+        layoutA.addWidget(self.btn_savedata, 4, 2)
         self._add_backend_controls()
     def _add_backend_controls(self):
@@ -180,7 +189,7 @@ class owsavetodb(OWBaseSql, OWWidget):
             self.Error.connection(str(ex))
     def create_table(self, table_name):
+        start_time = time.time()
         self.progressBarInit()
         contBar = 0
         contMetasOriginales = 0
@@ -246,35 +255,115 @@ class owsavetodb(OWBaseSql, OWWidget):
                     pass
             except BackendError as ex:
                 self.Error.connection(str(ex))
-            self.progressBarFinished()
+        self.progressBarFinished()
+        if str(self.emailDirection.text()) != "":
+            end_time = time.time()
+            time_elapsed = end_time - start_time
+            time_elapsed = round(time_elapsed, 3)
+            self.send_mail(str(self.emailDirection.text()), time_elapsed)
+    def send_mail(self, mail, time_elapsed):
+        # Configuración de la connexión
+        sender = 'savetodbodm@gmail.com'
+        password = 'arnj lakd lyol rakg'
+        server = 'smtp.gmail.com'
+        port = 587
+        # Configuración del destinatario
+        to = mail
+        # configuración de las cabeceras y del mensaje
+        message = MIMEMultipart("alternative")
+        current_datetime = datetime.now()
+        formatted_datetime = current_datetime.strftime('%d-%m-%Y %H:%M:%S')
+        message["Subject"] = "Upload completed - Save To DB - " + str(formatted_datetime)
+        message["From"] = sender
+        message["To"] = to
+        if self.data.domain.class_var:
+            class_name = self.data.domain.class_var.name
+        else:
+            class_name = None
+        body = f"""\
+        <html>
+            <head>
+            </head>
+            <body>
+                <h1>Save to DB - Widget</h1>
+                <p>Your data upload has been completed!</p>
+                <p>-Table information:</p>
+                <ul>
+                    <li>Table name: {str(self.tableName.text())}.</li>
+                    <li>{str(self.rows_label.text())}.</li>
+                    <li>{str(self.cols_label.text())}.</li>
+                    <li>Class name: {str(class_name)}</li>
+                    <li>{str(self.target_label.text())}.</li>
+                </ul>
+                <p>-Connection information:</p>
+                <ul>
+                    <li>Server name: {str(self.servertext.text())}</li>
+                    <li>Database name: {str(self.databasetext.text())}</li>
+                    <li>Time Elapsed: {str(time_elapsed)}s.</li>
+                </ul>
+            </body>
+        </html>
+        """
+        part = MIMEText(body, "html")
+        message.attach(part)
+        # Envío del mensaje
+        try:
+            context = ssl.create_default_context()
+            with smtplib.SMTP(server, port=port) as smtp:
+                smtp.starttls(context=context)
+                smtp.login(sender, password)
+                smtp.send_message(message)
+        except Exception as ex:
+            self.Error.connection(str(ex))
     def saveData(self):
         self.clear()
+        email_regex = r'\b[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Z|a-z]{2,}\b'
         if self.tableName.text() == "":
             self.Error.connection("Table name must be filled.")
         elif self.servertext.text() == "" or self.databasetext.text() == "":
             self.Error.connection("Host and database fields must be filled.")
+        elif self.emailDirection.text() != "":
+            if not re.match(email_regex, self.emailDirection.text()):
+                self.Error.connection("The field email must be an email.")
+            else:
+                self.insert_data()
         else:
-            self.create_master_table()
+            self.insert_data()
-            if self.data.domain.class_var:
-                class_name = self.data.domain.class_var.name
-            else:
-                class_name = None
+    def insert_data(self):
+        self.create_master_table()
-            query = "INSERT INTO public.datasets (name, datetime, rows, cols, class, class_name) VALUES ('" + self.tableName.text().lower() + "','" + datetime.now().strftime(
-                '%Y-%m-%d %H:%M:%S') + "','" + str(self.rows) + "','" + str(self.cols) + "','" + str(
-                self.target) + "','" + str(class_name) + "');"
+        if self.data.domain.class_var:
+            class_name = self.data.domain.class_var.name
+        else:
+            class_name = None
+        query = "INSERT INTO public.datasets (name, datetime, rows, cols, class, class_name) VALUES ('" + self.tableName.text().lower() + "','" + datetime.now().strftime(
+            '%Y-%m-%d %H:%M:%S') + "','" + str(self.rows) + "','" + str(self.cols) + "','" + str(
+            self.target) + "','" + str(class_name) + "');"
+        try:
+            with self.backend.execute_sql_query(query):
+                pass
+                self.create_table(self.tableName.text().lower())
+        except BackendError as ex:
+            self.Error.connection(str(ex))
-            try:
-                with self.backend.execute_sql_query(query):
-                    pass
-                    self.create_table(self.tableName.text().lower())
-            except BackendError as ex:
-                self.Error.connection(str(ex))
     def highlight_error(self, text=""):
         err = ['', 'QLineEdit {border: 2px solid red;}']
         self.servertext.setStyleSheet(err['server' in text or 'host' in text])

{TimeFeatures-1.0.11 → TimeFeatures-1.0.13}/timefeatures/widgets/owtimefeaturesconstructor.py RENAMED Viewed

@@ -819,6 +819,7 @@ class owtimefeaturesconstructor(OWWidget, ConcurrentWidgetMixin):
     class Inputs:
         data = Input("Data", Orange.data.Table)
+        expressions = Input("Variable Definitions", Orange.data.Table)
     class Outputs:
         data = Output("Data", Orange.data.Table)
@@ -1103,6 +1104,35 @@ class owtimefeaturesconstructor(OWWidget, ConcurrentWidgetMixin):
         self.fix_button.setHidden(not self.expressions_with_values)
         self.editorstack.setEnabled(self.currentIndex >= 0)
+    @Inputs.expressions
+    @check_sql_input
+    def setExpressions(self, expressions=None):
+        self.expressions = expressions
+        if self.expressions is None:
+            self.Warning.clear()
+            self.Error.transform_error.clear()
+        if self.data is not None and self.expressions is not None:
+            if self.expressions is not None:
+                if len(self.expressions.domain) >= 2 and (
+                        self.expressions.domain[0].name != "Variable" or self.expressions.domain[1].name != "Expression"):
+                    self.Warning.table_warning()
+                else:
+                    self.Error.transform_error.clear()
+                    for datos in reversed(self.expressions):
+                        if not math.isnan(datos[1]) and str(datos[1]) != "NaN":
+                            desc = ContinuousDescriptor(
+                                name=str(datos[0]),
+                                expression=str(datos[1]),
+                                meta=False,
+                                number_of_decimals=3,
+                            )
+                            self.addFeature(desc)
+        else:
+            self.Error.transform_error("There is not data input.")
     def handleNewSignals(self):
         if self.data is not None:
             self.apply()
@@ -1188,6 +1218,14 @@ class owtimefeaturesconstructor(OWWidget, ConcurrentWidgetMixin):
         desc = self._validate_descriptors(desc)
         self.start(run, self.data, desc, self.expressions_with_values)
+        '''
+        INTENTO DE PODER USAR VARIABLES NO CONTENIDAS EN EL DATASET ORIGINAL.
+        desc = list(self.featuremodel)
+        for d in desc:
+            self.start(run, self.data, self._validate_descriptors(d), self.expressions_with_values)'''
     def on_done(self, result: "Result") -> None:
         data, attrs, desc = result.data, result.attributes, result.desc
         disc_attrs_not_ok = self.check_attrs_values(
@@ -1361,6 +1399,7 @@ class Result:
 def run(data: Table, desc, use_values, task: TaskState) -> Result:
     if task.is_interruption_requested():
         raise CancelledError  # pragma: no cover
     new_variables, new_metas = construct_variables(desc, data, use_values)
     # Explicit cancellation point after `construct_variables` which can
     # already run `compute_value`.
@@ -1374,10 +1413,14 @@ def run(data: Table, desc, use_values, task: TaskState) -> Result:
     try:
         for variable in new_variables:
             variable.compute_value.mask_exceptions = False
-        data = data.transform(new_domain)
+        try:
+            data = data.transform(new_domain)
+        except:
+            raise TypeError("One or more variables were not found.")
     finally:
         for variable in new_variables:
             variable.compute_value.mask_exceptions = True
     return Result(data, new_variables, new_metas, desc)
@@ -1456,6 +1499,7 @@ def validate_exp(exp):
 def construct_variables(descriptions, data, use_values=False):
     # subs
     variables = []
     metas = []
     source_vars = data.domain.variables + data.domain.metas

{TimeFeatures-1.0.11 → TimeFeatures-1.0.13}/timefeatures/widgets/owvardependencygraph.py RENAMED Viewed

@@ -17,7 +17,11 @@ from PyQt5.QtWidgets import QPushButton, QVBoxLayout, QHBoxLayout
 from orangecontrib.network import Network
 from orangewidget.utils.signals import Input
-'''def calculate_weight(expression):
+'''
+CALCULO DE PONDERACIONES PARA LOS PESOS DE LAS ARISTAS.
+def calculate_weight(expression):
     # Encontrar todas las coincidencias con las funciones temporales y almacenarlas
     matches_shift = list(re.finditer(r'shift\(([^,]+),([-+]?\d+)\)', expression))
     matches_sum = list(re.finditer(r'sum\(([^,]+),([-+]?\d+),([-+]?\d+)\)', expression))