Merge pull request #41 from hANSIc99/dev

v1.3 ready

Author: hANSIc99

CHANGES.txt

@@ -1,3 +1,10 @@
+1.3
+
+    Scheduler for manual trigger added
+    Possibility to control running state programatically added
+    Telegram bot control element added
+
+
 1.2
 
     Templates added

Containerfile

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

DOKU.md

@@ -0,0 +1,46 @@
+## Documentation
+
+
+### Basic Elements
+
+#### Scheduler
+<img src="https://github.com/hANSIc99/Pythonic/blob/master/src/Pythonic/public_html/static/Scheduler.png" alt="Scheduler">
+
+The *Scheduler* activates subsequent elements depending on the set schedule.
+
+- Start subsequent elements
+- Start by hand
+- Optional: Autostart on startup
+
+#### Generic Pipe
+<img src="https://github.com/hANSIc99/Pythonic/blob/master/src/Pythonic/public_html/static/GenericPipe.png" alt="Scheduler">
+
+The *Generic Pipe* processes the input data and terminates immediately after completion.
+
+Intendet use: 
+- Simple data processing
+- Tranformation of data between two elements
+
+#### Generic Process
+<img src="https://github.com/hANSIc99/Pythonic/blob/master/src/Pythonic/public_html/static/GenericProcess.png" alt="Scheduler">
+
+The *Generic Process* executes an infinite loop. The executions stops when a stop signal is received or, in case of multiprocessing, when the process is killed.
+
+**Attention**: Every time the element is triggered another instance of the *Generic Process* is created.
+
+Intendet use: 
+- Listener application
+- Waiting for external events (e.g. TCP/IP related)
+
+#### Process Pipe
+<img src="https://github.com/hANSIc99/Pythonic/blob/master/src/Pythonic/public_html/static/ProcessPipe.png" alt="Scheduler">
+
+The *Process Pipe* executes an infinite loop. In contrast to *Generic Process* additional activations of the *Process Pipe* element won't cause
+the creation of additional instances. The payload of subsequent activations can be processed within the loop.
+
+Intendet use: 
+- Stream processing
+- Long running processes
+- Machine learning
+- Feed process with varying data
+

TODOS

@@ -13,3 +13,6 @@ Check if the 'inline'-keyword can be applied to some loops
 
 5)
 Add debugging capabilities to Docker image
+
+DataClasses
+Check if DataClasses can be used (elementtypes.py)

build.sh

@@ -11,4 +11,4 @@
 src/code-server/download.sh
 
 # BUILD CONTAINER IMAGE
-podman build -t pythonicautomation/pythonic:1.2 .
+podman build -t pythonicautomation/pythonic:1.3 .

dist/Pythonic-1.3.tar.gz

@@ -5,7 +5,7 @@
 
 setuptools.setup(
         name = 'Pythonic',
-        version = '1.02',
+        version = '1.03',
         author = 'Stephan Avenwedde',
         author_email = '[email protected]',
         license = 'GPLv3',
@@ -16,18 +16,25 @@
         packages = ['Pythonic', 'Pythonic.executables'],
         package_dir = { '' : 'src'},
         package_data = { '' :
-            ['public_html/static/GenericPipe.png',
+            [
+             'public_html/static/ManualScheduler.png',
+             'public_html/static/Scheduler.png',
+             'public_html/static/ManualStopProcess.png',
+             'public_html/static/StopProcess.png',
+             'public_html/static/GenericPipe.png',
              'public_html/static/GenericProcess.png',
              'public_html/static/ProcessPipe.png',
-             'public_html/static/Scheduler.png',
+             'public_html/static/Telegram.png',
              'public_html/static/python.ico',
              'public_html/static/qtlogo.svg',
              'public_html/static/qtloader.js',
              'public_html/static/*.js',
              'public_html/static/*.wasm',
              'public_html/static/*.data',
              'public_html/templates/*.html',
-             'public_html/config/Toolbox/Basic/*'
+             'public_html/config/Toolbox/Basic/*',
+             'public_html/config/Toolbox/Connectivity/Telegram.editor',
+             'public_html/config/Toolbox/Connectivity/0Telegram.json'
              ]
         },
         entry_points = {
@@ -37,7 +44,8 @@
         install_requires = [
             'PySide2==5.14.2.3',
             'eventlet>=0.27.0',
-             'debugpy==1.2.1'
+            'debugpy==1.2.1',
+            'python-telegram-bot==13.4.1'
              ],
         classifiers = [
             'Programming Language :: Python :: 3.7',

setup.py

@@ -5,10 +5,10 @@ source ~/Dokumente/emsdk/emsdk_env.sh # Version 1.39.8
 ~/Qt/5.15.1/wasm_32/bin/qmake
 # Set WASM define
 #make DEFINES="-DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_WEBSOCKETS_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DWASM"
-#make clean
+make clean
 make
 
 cp *.html public_html/static/
 cp *.wasm public_html/static/
 cp *.js public_html/static/
-cp *.data public_html/static/
+cp *.data public_html/static/

src/Pythonic/build.sh

@@ -6,7 +6,6 @@
 from PySide2.QtCore import QThread, QObject, Signal, QMutex
 
 
-
 class ExecSysCMD(QThread):
 
     cmd = None
@@ -28,7 +27,6 @@ def run(self):
             os.system(self.cmd['Unix'])
 
 
-
 class ConfigWriter(QThread):
 
     config      = None
@@ -164,7 +162,7 @@ def cleanupThreadList(self):
                 x.editorLoaded.disconnect(self.fwrdCmd)
                 x.finished.disconnect(self.cleanupThreadList)
                 x.deleteLater()
-          
+
 
 class ToolboxLoader(QThread):
 
@@ -181,6 +179,8 @@ def run(self):
         #toolDirs = [ f for f in os.scandir(os.path.join(self.cwd + self.www_config + '/Toolbox/')) if f.is_dir() ]
         toolDirs = [ f for f in os.scandir(self.toolBoxPath) if f.is_dir() ]
         elements = [(d, f) for d in toolDirs for f in os.listdir(d.path) if f.endswith('.json')]
+        elements.sort(key=lambda record: record[1]) # sort elements alphabetical
+        elements.sort(key=lambda record: record[0].name) # sort groups alphabetical
         elementsJSON = []
 
         for d, f in elements:
@@ -205,7 +205,6 @@ def run(self):
         self.tooldataLoaded.emit(cmd)
 
 
-
 class ConfigLoader(QThread):
 
     configLoaded      = Signal(object)

src/Pythonic/configio.py

@@ -1,5 +1,5 @@
-import logging
-
+import logging, pickle
+from pathlib import Path
 
 
 class Function():
@@ -76,4 +76,72 @@ def __setstate__(self, state):
 
     def __getstate__(self):
         #logging.debug('__getstate__() called Record')
-        return(self.bStop, self.data)
+        return(self.bStop, self.data)
+
+
+def storePersist(func):
+
+    def wrapper(self, *args, **kwargs):
+
+        func(self, *args, **kwargs)
+
+        with open(self.filename, 'wb') as f:
+            try:
+                pickle.dump(self.copy(), f)
+            except Exception as e:
+                pass
+        
+    return wrapper
+
+
+class ListPersist(list):
+
+    def __init__(self, name: str) -> None:
+        # BAUSTELLE
+        self.filename = Path.home() / 'Pythonic' / 'executables' / '{}.obj'.format(name)
+
+        if self.filename.exists():
+
+            with open(self.filename, 'rb') as f:
+
+                data = pickle.load(f)
+                super().extend(data)
+
+
+
+    def reload(self):
+
+        if self.filename.exists():
+
+            with open(self.filename, 'rb') as f:
+
+                data = pickle.load(f)
+                super().clear()
+                super().extend(data)
+                return True
+
+        else:
+            return False
+
+
+    
+
+    @storePersist
+    def append(self, __object) -> None:
+        return super().append(__object)
+
+    @storePersist
+    def extend(self, __iterable) -> None:
+        return super().extend(__iterable)
+
+    @storePersist
+    def remove(self, __value) -> None:
+        return super().remove(__value)
+
+    @storePersist
+    def pop(self, __index: int):
+        return super().pop(__index=__index)
+
+    @storePersist
+    def clear(self) -> None:
+        return super().clear()