Merge pull request #53 from hANSIc99/dev

v1.9 ready

Author: hANSIc99

CHANGES.txt

@@ -1,3 +1,7 @@
+1.9
+
+    
+
 1.8
 
     CCXT: Fixed bug querying OHLCV data

Containerfile

@@ -9,7 +9,7 @@
 #                   Full multi-processing and multi-threading capable.
 #
 #
-#CreationDate:      05.04.2021
+#CreationDate:      10.11.2021
 #Creator:           Stephan Avenwedde
 #
 #
@@ -77,11 +77,11 @@ RUN /usr/bin/python3 -m pip install pylint==2.7.4
 ###################################
 
 
-COPY dist/Pythonic-1.8.tar.gz /
+COPY dist/Pythonic-1.9.tar.gz /
 
-RUN /usr/bin/python3 -m pip install /Pythonic-1.8.tar.gz
+RUN /usr/bin/python3 -m pip install /Pythonic-1.9.tar.gz
 
-RUN rm Pythonic-1.8.tar.gz
+RUN rm Pythonic-1.9.tar.gz
 
 ###################################
 #                                 #

TODOS

@@ -1,21 +1,35 @@
 General:
 
+Documentation:
+    When an element returns None, subsequent
+    elements are still triggered
+
+    Exceptions:
+    Elements should throw an exception when configuration
+    data is missing or cannot be processed
+
+    Elements should try to handle all possible exceptions internally
+    and only throw unhandled exceptions
+
+    The result of a operation (if successfull or not) should
+    be forwarded to subsequent elements in order to react to
+    a possible unsuccesfull operation
+
+    When input data is required to perform some task and it
+    is missing, elements should pass this information to subsequent elements
+    and not throw an exception.d
+
+
 CCXT Method: Remove large if-else areas for parsing config
 
 Python: Add type hints
 
 Check if the 'inline'-keyword can be applied to some loops
 (page 146 C++ Der Programmierer)
 
-Use dispatch tables instead of switch-case / if elif pattern
 
 Elementeditor:
 Add the possibility to pass arbitrary number of keyword arguments or
 to build a dictionary from within the editor
 
 
-element_types.py 
-execute_ex() : 
- - Signaliye an exception in the GUI
- - Remove return value as it is not processed
-

build_rpi.sh

@@ -0,0 +1,17 @@
+#!/bin/sh
+
+# BUILD WASM FRONTEND
+
+#src/Pythonic/build.sh
+
+
+# BUILD PIP PACKAGE RPI
+cp setup_rpi.py setup.py
+cp setup_rpi.cfg setup.cfg
+python3 setup.py sdist
+
+# DOWNLOAD CODE SERVER EXTENSIONS
+#src/code-server/download.sh
+
+# BUILD CONTAINER IMAGE
+#podman build -t pythonicautomation/pythonic:1.7 .

build.sh renamed to build_x86.sh

@@ -9,10 +9,6 @@ cp setup_x86.py setup.py
 cp setup_x86.cfg setup.cfg
 python3 setup.py sdist
 
-# BUILD PIP PACKAGE x86
-cp setup_rpi.py setup.py
-cp setup_rpi.cfg setup.cfg
-python3 setup.py sdist
 
 # DOWNLOAD CODE SERVER EXTENSIONS
 #src/code-server/download.sh

dist/Pythonic-1.9.tar.gz

@@ -5,7 +5,7 @@
 
 
 setuptools.setup(
-        version = '1.06',
+        version = '1.09',
         author = 'Stephan Avenwedde',
         author_email = '[email protected]',
         license = 'GPLv3',
@@ -24,6 +24,8 @@
              'public_html/static/GenericPipe.png',
              'public_html/static/GenericProcess.png',
              'public_html/static/ProcessPipe.png',
+             'public_html/static/GPIO_Read.png',
+             'public_html/static/GPIO_Write.png',
              'public_html/static/Telegram.png',
              'public_html/static/CCXT.png',
              'public_html/static/CCXT_Method.png',
@@ -35,6 +37,7 @@
              'public_html/static/*.data',
              'public_html/templates/*.html',
              'public_html/config/Toolbox/0Basic/*',
+             'public_html/config/Toolbox/1IO/*',
              'public_html/config/Toolbox/2Connectivity/Telegram.editor',
              'public_html/config/Toolbox/2Connectivity/0Telegram.json',
              'public_html/config/Toolbox/3Trading/*'
@@ -61,4 +64,4 @@
             'Natural Language :: English',
             'Topic :: Software Development'
             ],
-        )
+        )

dist/PythonicRPI-1.9.tar.gz

@@ -5,7 +5,7 @@
 
 
 setuptools.setup(
-        version = '1.08',
+        version = '1.09',
         author = 'Stephan Avenwedde',
         author_email = '[email protected]',
         license = 'GPLv3',
@@ -27,6 +27,7 @@
              'public_html/static/GPIO_Read.png',
              'public_html/static/GPIO_Write.png',
              'public_html/static/Telegram.png',
+             'public_html/static/Email.png',
              'public_html/static/CCXT.png',
              'public_html/static/CCXT_Method.png',
              'public_html/static/python.ico',
@@ -40,6 +41,8 @@
              'public_html/config/Toolbox/1IO/*',
              'public_html/config/Toolbox/2Connectivity/Telegram.editor',
              'public_html/config/Toolbox/2Connectivity/0Telegram.json',
+             'public_html/config/Toolbox/2Connectivity/EMail.editor',
+             'public_html/config/Toolbox/2Connectivity/1EMail.json',
              'public_html/config/Toolbox/3Trading/*'
              ]
         },

setup.py

@@ -5,7 +5,7 @@
 
 
 setuptools.setup(
-        version = '1.08',
+        version = '1.09',
         author = 'Stephan Avenwedde',
         author_email = '[email protected]',
         license = 'GPLv3',
@@ -25,6 +25,7 @@
              'public_html/static/GenericProcess.png',
              'public_html/static/ProcessPipe.png',
              'public_html/static/Telegram.png',
+             'public_html/static/Email.png',
              'public_html/static/CCXT.png',
              'public_html/static/CCXT_Method.png',
              'public_html/static/python.ico',
@@ -37,6 +38,8 @@
              'public_html/config/Toolbox/0Basic/*',
              'public_html/config/Toolbox/2Connectivity/Telegram.editor',
              'public_html/config/Toolbox/2Connectivity/0Telegram.json',
+             'public_html/config/Toolbox/2Connectivity/EMail.editor',
+             'public_html/config/Toolbox/2Connectivity/1EMail.json',
              'public_html/config/Toolbox/3Trading/*'
              ]
         },

setup_rpi.py

@@ -31,11 +31,11 @@ def execute_ex(self):
         try:
             result = self.execute()
         except Exception as e:
-            self.logger.error(e)
+            guiexc = GuiException()
+            self.return_queue.put(guiexc)
+            self.logger.error(repr(e))
             # signalize exception on GUI
-            result = e
 
-        return result
 
 class Record():
 
@@ -64,6 +64,8 @@ def __setstate__(self, state):
     def __getstate__(self):
         return(self.text)
 
+class GuiException:
+    pass
 
 class ProcCMD:
 

setup_x86.py

@@ -191,9 +191,14 @@ void Elementeditor::loadEditorConfig(const QJsonArray config)
         }
 
         case ElementEditorTypes::LineEdit2: {
-            addLineEdit2(unit);
+            addLineEdit2(unit, false);
             break;
         }
+        case ElementEditorTypes::PwEdit2: {
+            addLineEdit2(unit, true);
+            break;
+        }
+
         case ElementEditorTypes::CheckBox: {
             addCheckBox(unit);
             break;
@@ -238,6 +243,7 @@ ElementEditorTypes::Type Elementeditor::hashType(const QString &inString)
     if(inString == QStringLiteral("ComboBox"))  return ElementEditorTypes::ComboBox;
     if(inString == QStringLiteral("LineEdit"))  return ElementEditorTypes::LineEdit;
     if(inString == QStringLiteral("LineEdit2")) return ElementEditorTypes::LineEdit2;
+    if(inString == QStringLiteral("PwEdit2"))   return ElementEditorTypes::PwEdit2;
     if(inString == QStringLiteral("CheckBox"))  return ElementEditorTypes::CheckBox;
     if(inString == QStringLiteral("Text"))      return ElementEditorTypes::Text;
     if(inString == QStringLiteral("HelpText"))  return ElementEditorTypes::HelpText;
@@ -651,7 +657,7 @@ void Elementeditor::addLineEdit(const QJsonObject &lineeditJSON)
     addRules(lineeditJSON.value(QStringLiteral("Dependency")), qobject_cast<QWidget*>(lineedit));
 }
 
-void Elementeditor::addLineEdit2(const QJsonObject &lineeditJSON)
+void Elementeditor::addLineEdit2(const QJsonObject &lineeditJSON, bool pw)
 {
     qCInfo(logC, "called %s", parent()->objectName().toStdString().c_str());
 
@@ -675,6 +681,12 @@ void Elementeditor::addLineEdit2(const QJsonObject &lineeditJSON)
         lineedit->m_lineedit.setText(defaultText);
     }
 
+    /* Enabling echo mode for passwords */
+    if(pw){
+       lineedit->m_lineedit.setEchoMode(QLineEdit::Password);
+    }
+
+
     /* Adding RegExp (if given) */
 
     QString regExpString = lineeditJSON[QStringLiteral("RegExp")].toString();

src/Pythonic/element_types.py

@@ -63,6 +63,7 @@ namespace ElementEditorTypes {
         ComboBox,
         LineEdit,
         LineEdit2,
+        PwEdit2,
         CheckBox,
         Text,
         HelpText,
@@ -281,7 +282,7 @@ public slots:
 
     void            addLineEdit(const QJsonObject &lineeditJSON);
 
-    void            addLineEdit2(const QJsonObject &lineeditJSON);
+    void            addLineEdit2(const QJsonObject &lineeditJSON, bool pw);
 
     void            addCheckBox(const QJsonObject &checkboxJSON);
 

src/Pythonic/elementeditor.cpp

@@ -55,8 +55,6 @@ ElementMaster::ElementMaster(const QJsonObject configuration,
 
     /* Create the basic data */
 
-    //m_hasSocket = m_config[QStringLiteral("Socket")].toBool();
-
     /* Create default general config if not defined */
 
     QJsonValue generalConfig = m_config.value(QStringLiteral("Config"));
@@ -303,7 +301,6 @@ void ElementMaster::fwrdWsCtrl(const QJsonObject cmd)
     };
     newCmd["address"] = address;
 
-
     emit wsCtrl(newCmd);
 }
 
@@ -312,17 +309,46 @@ ElementMasterCmd::Command ElementMaster::hashCmd(const QString &inString)
     if(inString == QStringLiteral("ElementEditorConfig")) return ElementMasterCmd::ElementEditorConfig;
     if(inString == QStringLiteral("UpdateElementStatus")) return ElementMasterCmd::UpdateElementStatus;
     if(inString == QStringLiteral("ElementText")) return ElementMasterCmd::ElementText;
+    if(inString == QStringLiteral("ElementException")) return ElementMasterCmd::ElementException;
     if(inString == QStringLiteral("Test")) return ElementMasterCmd::Test;
     return ElementMasterCmd::NoCmd;
 }
 
+void ElementMaster::ShowText(const QString &inString)
+{
+    if(!m_hasException){
+        m_textLabel.setStyleSheet(QStringLiteral("background-color: #ffffca; border: 1px solid black;"));
+        m_text.setVisible(true);
+        m_textLabel.setText(inString);
+    }
+}
+
+void ElementMaster::HideText()
+{
+    if(!m_hasException){
+        m_text.setVisible(false);
+    }
+}
+
+void ElementMaster::ShowException(const QString &ts)
+{
+    m_text.setVisible(true);
+    m_textLabel.setStyleSheet(QStringLiteral("background-color: #ff0000; color: #ffffff; border: 1px solid black;"));
+    m_textLabel.setText(ts + QStringLiteral("\nExecption occured, open log for details"));
+    m_hasException = true;
+}
+
+void ElementMaster::HideException()
+{
+    m_hasException = false;
+    m_text.setVisible(false);
+}
+
 void ElementMaster::fwrdWsRcv(const QJsonObject cmd)
 {
     qCInfo(logC, "called %s", objectName().toStdString().c_str());
 
     QJsonObject address = cmd[QStringLiteral("address")].toObject();
-    //QLatin1String strCmd(   cmd[QStringLiteral("cmd")].toString().toLatin1(),
-    //                        cmd[QStringLiteral("cmd")].toString().size());
 
     switch (hashCmd(cmd[QStringLiteral("cmd")].toString())) {
 
@@ -342,8 +368,12 @@ void ElementMaster::fwrdWsRcv(const QJsonObject cmd)
     }
     case ElementMasterCmd::ElementText: {
         QString text = cmd[QStringLiteral("data")].toString();
-        m_text.setVisible(true);
-        m_textLabel.setText(text);
+        ShowText(text);
+        break;
+    }
+    case ElementMasterCmd::ElementException: {
+        QString ts = cmd[QStringLiteral("TS")].toString();
+        ShowException(ts);
         break;
     }
 
@@ -357,9 +387,11 @@ void ElementMaster::fwrdWsRcv(const QJsonObject cmd)
 void ElementMaster::openEditor()
 {
     qCInfo(logC, "called %s", objectName().toStdString().c_str());
+    HideException();
     /* A default general config is created in the constructor */
     /* The specific config contains nothing when this is called the first time */
     m_editor->openEditor(m_customConfig);
+
 }
 
 void ElementMaster::switchRunState(bool state)
@@ -372,7 +404,7 @@ void ElementMaster::switchRunState(bool state)
     } else {
         m_symbol.setStyleSheet(styleSheet());
         m_startBtn.togggleRunning(false);
-        m_text.setVisible(false);
+        HideText();
     }
 
     /* Element has a start button instead of a socket */