Merge pull request #37 from hANSIc99/dev

v1.1 ready

Author: hANSIc99

CHANGES.txt

@@ -1,3 +1,12 @@
+1.1
+    PythonicDaemon: Bug in execution_operator fixed (reloading modules)
+    PythonicDaemon: Bug in GenericPython template fixed (wrong name of queue)
+
+
+
+######################################################################
+
+
 0.18
 
     PythonicDaemon: tty bug fixed: can be run as cronjob now

Containerfile

@@ -9,7 +9,7 @@
 #                   Full multi-processing and multi-threading capable.
 #
 #
-#CreationDate:      24.12.2020
+#CreationDate:      17.03.2021
 #Creator:           Stephan Avenwedde
 #
 #
@@ -57,10 +57,8 @@ RUN dnf -y install pip
 #                                 #
 ###################################
 
-
 RUN /usr/bin/python3 -m pip install supervisor==4.2.1
 
-
 
 ###################################
 #                                 #
@@ -95,10 +93,11 @@ RUN rm /ms-python.vscode-pylance-2020.12.2.vsix
 RUN /usr/bin/python3 -m pip install eventlet==0.30.0
 RUN /usr/bin/python3 -m pip install PySide2==5.12.2
 
-COPY dist/Pythonic-1.0.tar.gz /
+COPY dist/Pythonic-1.1.tar.gz /
 
-RUN /usr/bin/python3 -m pip install /Pythonic-1.0.tar.gz
+RUN /usr/bin/python3 -m pip install /Pythonic-1.1.tar.gz
 
+RUN rm Pythonic-1.1.tar.gz
 
 ###################################
 #                                 #
@@ -107,9 +106,8 @@ RUN /usr/bin/python3 -m pip install /Pythonic-1.0.tar.gz
 ###################################
 
 COPY src/code-server/config.yaml /root/.config/code-server/
-COPY src/supervisor/supervisord.conf /etc/
-
+COPY src/supervisor/supervisord.conf /etc/supervisord.conf
 
-ENTRYPOINT ["/usr/local/bin/supervisord -c /etc/supervisord.conf"]
-WORKDIR /root
 
+ENTRYPOINT ["/usr/local/bin/supervisord", "-c", "/etc/supervisord.conf"]
+WORKDIR /root

build.sh

@@ -7,5 +7,8 @@ src/Pythonic/build.sh
 # BUILD PIP PACKAGE
 python3 setup.py sdist
 
+# DOWNLOAD CODE SERVER EXTENSIONS
+src/code-server
+
 # BUILD CONTAINER IMAGE
-podman build -t pythonic:0.1 .
+podman build -t pythonic:1.1 .

dist/Pythonic-1.1.tar.gz

@@ -5,7 +5,7 @@
 
 setuptools.setup(
         name = 'Pythonic',
-        version = '1.0',
+        version = '1.01',
         author = 'Stephan Avenwedde',
         author_email = '[email protected]',
         license = 'GPLv3',
@@ -21,10 +21,10 @@
              'public_html/static/python.ico',
              'public_html/static/qtlogo.svg',
              'public_html/static/qtloader.js',
-             'public_html/static/PythonicWeb.js',
-             'public_html/static/PythonicWeb.wasm',
-             'public_html/static/PythonicWeb.data',
-             'public_html/templates/PythonicWeb.html',
+             'public_html/static/*.js',
+             'public_html/static/*.wasm',
+             'public_html/static/*.data',
+             'public_html/templates/*.html',
              'public_html/config/Toolbox/Basic/GenericPython.json',
              'public_html/config/Toolbox/Basic/GenericPython.editor',
              'public_html/config/Toolbox/Basic/Scheduler.json',

setup.py

@@ -3,8 +3,9 @@ QT       += core gui websockets
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
 
+#TARGET="PythonicWeb_1.1"
 CONFIG += c++11
-#CONFIG += wasm
+CONFIG += wasm
 
 wasm {
 DEFINES += WASM

src/Pythonic/PythonicWeb.pro

@@ -8,8 +8,7 @@ source ~/Dokumente/emsdk/emsdk_env.sh # Version 1.39.8
 #make clean
 make
 
-cp PythonicWeb.html public_html/static/
-cp qtloader.js public_html/static/
-cp PythonicWeb.wasm public_html/static/
-cp PythonicWeb.js public_html/static/
-cp PythonicWeb.data public_html/static/
+cp *.html public_html/static/
+cp *.wasm public_html/static/
+cp *.js public_html/static/
+cp *.data public_html/static/

src/Pythonic/build.sh

@@ -34,7 +34,7 @@ def execute(self):
         ####################################################
 
         #recordDone = Record(cnt, 'Sending value of cnt: {}'.format(cnt))     
-        #self.queue.put(recordDone)
+        #self.return_queue.put(recordDone)
         #return
 
 

src/Pythonic/executables/generic_python.py

@@ -4,6 +4,7 @@
 import random
 import multiprocessing as mp
 import threading as mt
+from importlib import reload
 from pathlib import Path
 from PySide2.QtCore import QCoreApplication, QObject, QThread, Qt, QTimer
 from PySide2.QtCore import Signal
@@ -57,13 +58,17 @@ def run(self):
 
         try:
 
-            #executable = str(Path.home() / 'Pythonic' / 'executables' / ) + '.py'
-            #elementCls = getattr(__import__('executables.' + self.element['Filename'], fromlist=['Element']), 'Element')
-            elementCls = getattr(__import__(self.element['Filename'], fromlist=['Element']), 'Element')
-            #logging.debug('ProcessHandler::run() - loading file - id: 0x{:08x}, ident: {:04d} - {}'.format(
-            #    self.element['Id'], self.identifier, self.element['Filename']))
+            # This affects only first invocation
+            module = __import__(self.element['Filename'])
+            #logging.warning("Load module first time")
+            
+            # Reload to execute possible changes
+            module = reload(module) 
+
+            elementCls = getattr(module, 'Element')
+
         except Exception as e:
-            logging.debug('ProcessHandler::run() - Error loading file - id: 0x{:08x}, ident: {:04d} - {} Error: {}'.format(
+            logging.warning('ProcessHandler::run() - Error loading file - id: 0x{:08x}, ident: {:04d} - {} Error: {}'.format(
                 self.element['Id'], self.identifier, self.element['Filename'], e))
             return
 

src/Pythonic/execution_operator.py

@@ -10,7 +10,7 @@ def reset_screen():
                     '|_|    \__, |\__|_| |_|\___/|_| |_|_|\___|____/ \__,_|\___|_| |_| |_|\___/|_| |_|\n'\
                     '       |___/                                                                     \n'
 
-    version         = 'v1.0\n'
+    version         = 'v1.1\n'
     gitHub          = 'Visit https://github.com/hANSIc99/Pythonic\n'
     log_info_msg    = '<<<<<<<<<<<< Logging directory ~/Pythonic/log/\n'
 

src/Pythonic/screen.py

@@ -1,6 +1,17 @@
 #!/bin/sh
+cd "${0%/*}"
+
+
+if [ -f "code-server-3.8.0-amd64.rpm" ]; then
+    echo "code-server-3.8.0-amd64.rpm exists."
+else 
+    echo "Download code-server-3.8.0-amd64.rpm"
+    curl -LJ0 https://github.com/cdr/code-server/releases/download/v3.8.0/code-server-3.8.0-amd64.rpm -o code-server-3.8.0-amd64.rpm
+fi
+
+
+
 
-#FILE=/etc/resolv.conf
 
 if [ -f "ms-python-release.vsix" ]; then
     echo "ms-python-release.vsix exists."
@@ -9,11 +20,13 @@ else
     curl -LJ0 https://github.com/microsoft/vscode-python/releases/download/2020.10.332292344/ms-python-release.vsix -o ms-python-release.vsix
 fi
 
+
+
 if [ -f "ms-python.vscode-pylance-2020.12.2.vsix" ]; then
     echo "ms-python.vscode-pylance-2020.12.2.vsix exists."
 else 
     echo "Download ms-python.vscode-pylance-2020.12.2.vsix"
-    curl -LJ0 https://www.vsixhub.com/go.php?post_id=32420&s=publish&link=https%3A%2F%2Ff.vsixhub.com%2Ffile.php%3Fpost_id%3D32420%26app_id%3D364d2426-116a-433a-a5d8-a5098dc3afbd%26version%3D2020.12.2%26ext_name%3Dvscode-pylance -o ms-python.vscode-pylance-2020.12.2.vsix
+    curl -LJ0 "https://www.vsixhub.com/go.php?post_id=32420&s=publish&link=https%3A%2F%2Ff.vsixhub.com%2Ffile.php%3Fpost_id%3D32420%26app_id%3D364d2426-116a-433a-a5d8-a5098dc3afbd%26version%3D2020.12.2%26ext_name%3Dvscode-pylance" -o ms-python.vscode-pylance-2020.12.2.vsix
 fi
 
 

src/code-server/download.sh

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-podman run -d --name Pythonic -p 7000:7000 -p 8000:8000 pythonic:0.1
+podman run -d --name Pythonic -p 7000:7000 -p 8000:8000 pythonic:1.1

src/run.sh

@@ -17,7 +17,6 @@ supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
 [program:pythonic]
 command=/usr/local/bin/Pythonic
 user=root
-stdout_logfile=None
 stderr_logfile_maxbytes=50MB
 stderr_logfile_backups=10
 stderr_logfile=/var/log/pythonic-stderr.log