easycoder 260108.1__py2.py3-none-any.whl → 260110.1__py2.py3-none-any.whl

easycoder/__init__.py

@@ -9,10 +9,9 @@ from .ec_gclasses import *
 from .ec_graphics import *
 from .ec_handler import *
 from .ec_keyboard import *
-from .ec_mqtt import *
 from .ec_program import *
 from .ec_psutil import *
 from .ec_timestamp import *
 from .ec_value import *
 
-__version__ = "260108.1"
+__version__ = "260110.1"

easycoder/ec_classes.py

@@ -421,19 +421,13 @@ class ECList(ECValueHolder):
 
     # Set the value to an ECValue
     def setValue(self, value):
-        varType = value.getType()
-        if type_in(varType, (str, 'list')):
-            content = value.getContent()
-            if types_equal(varType, str):
-                try:
-                    if content in ('', [], None): content = []
-                    else: content = json.loads(content)
-                except:
-                    raise RuntimeError(None, 'ECList string value is not valid JSON') # type: ignore
-        elif varType == None:
-             content = []
+        content = value.getContent()
+        if content in ('', None): content = []
         else:
-            raise RuntimeError(None, 'ECList can only hold list values or None') # type: ignore
+            try:
+                content = json.loads(content) # type: ignore
+            except:
+                pass
         super().setValue(content)
     
     def getValue(self):

easycoder/ec_core.py

@@ -515,7 +515,7 @@ class Core(Handler):
         self.run(label)
         return next
 
-    # get {variable) from {url} [or {command}]
+    # get {variable) from url {url} [or {command}]
     def k_get(self, command):
         if self.nextIsSymbol():
             record = self.getSymbolRecord()

easycoder/ec_handler.py

@@ -76,4 +76,4 @@ class Handler:
 
 	# Get the value of an unknown item (domain-specific)
 	def getUnknownValue(self, value):
-		return None # Unable to get value
+		return value

easycoder/ec_program.py

@@ -119,15 +119,6 @@ class Program:
 			self.useClass(Graphics)
 		return True
 	
-	# Use the mqtt module
-	def useMQTT(self):
-		if self.psutil == None:
-			print('Loading mqtt module')
-			from .ec_mqtt import MQTT
-			self.psutil = MQTT
-			self.useClass(MQTT)
-		return True
-	
 	# Use the psutil module
 	def usePSUtil(self):
 		if self.psutil == None:

{easycoder-260108.1.dist-info → easycoder-260110.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: easycoder
-Version: 260108.1
+Version: 260110.1
 Summary: Rapid scripting in English
 Keywords: compiler,scripting,prototyping,programming,coding,python,low code,hypertalk,computer language,learn to code
 Author-email: Graham Trott <gtanyware@gmail.com>

{easycoder-260108.1.dist-info → easycoder-260110.1.dist-info}/RECORD

@@ -1,15 +1,14 @@
-easycoder/__init__.py,sha256=oW8ul-SgIxWPDeKSUYVPmMz7dNoLbFU0bAMTZ3Co70E,416
+easycoder/__init__.py,sha256=BGeDPezNlTrRuE_hKj-gFXQPiDOgUbJYjSM10Bi-7Ak,393
 easycoder/ec_border.py,sha256=2qgGYxB-tIk_ZM0CmW3Yt7TotlUwxwrN9fL3cCvn8eE,2599
-easycoder/ec_classes.py,sha256=52WQcx7eZMZUCgghtSggCToWoDt0MqTxBrGv_blm9Xc,17244
+easycoder/ec_classes.py,sha256=LWxB8T2n8KYmVdmz9uqRJWfZ8gcwHg-UsledXz0PHTA,16869
 easycoder/ec_compiler.py,sha256=nAWaWvswTZpzNB_J--UWNVP7s7i7XuUnjKw8ZQ3ZHy4,7706
 easycoder/ec_condition.py,sha256=BU59phivUDEAjmhBZTVziJ510MswXAPV1kMTa2I8QoQ,785
-easycoder/ec_core.py,sha256=mhwxz4i9_3EKw5Izw50YOH6yEj8wCZMlNZdbMbVRoPo,103162
+easycoder/ec_core.py,sha256=1T8duclQVnGmQOtwstt6J3SkRjDASm1YxEGYDAGDpsg,103166
 easycoder/ec_gclasses.py,sha256=MQumyaZp0WFcEXOlhKvLV-RjO2osFpZ-ja-EPw8Qsgg,6808
 easycoder/ec_graphics.py,sha256=7rbn2HBAbS6r88jCnwOo9svGfMLs-pBV0Hnj2QHEDrI,67371
-easycoder/ec_handler.py,sha256=d3IJq6zEiXYEQUz_sNxtuIM-VKfn6ESyUD4mGr2Ptpo,2680
+easycoder/ec_handler.py,sha256=K_Md0SRx3AzzDD7PEaBs9FkA4qXSTL59tzhgv8CVuHE,2659
 easycoder/ec_keyboard.py,sha256=R6JvgUwvgj4pJiGwXbPrFmhC-DSxJbZQnPQ9pzabrMM,19705
-easycoder/ec_mqtt.py,sha256=sBz69QWXeCSMzllghzPZm_Z_2F-GFKgFVFCK2VXMK_c,8613
-easycoder/ec_program.py,sha256=zZ3utezhcaDJYGHeWjPShiqWSOhErj7wHoSHoMpE_vU,16354
+easycoder/ec_program.py,sha256=0Hl3mSGBUfPVImy5dCQSWog_nel-iySpOWEfNPx2yBA,16163
 easycoder/ec_psutil.py,sha256=4rs6BT4gzzNsD3VZP4-p1B55HiOVK6rASyPYylUU8bI,1543
 easycoder/ec_timestamp.py,sha256=z-HonUY7BDjgVVf2W_qQynnFjwGc_dAYultFjAmrXpg,307
 easycoder/ec_value.py,sha256=EbWNhvK4PNX-1rW0ky8TLS4krQS5NDkwsJ7aJ4iZxx4,3554
@@ -52,8 +51,8 @@ easycoder/pre/icons/run.png,sha256=5hDyMPMlY9ypA_rR5gqM5hb4vGIg2A4_pcEmPCq0iaM,3
 easycoder/pre/icons/step.png,sha256=r4XW-2GBVrYm7kb-xvth7jHMX3g9Ge-3onfpdOHyhyE,8224
 easycoder/pre/icons/stop.png,sha256=MoK6EbWFxDBdCH_ojTehjb7ty_Ax27n-8fKK_yBonfs,1832
 easycoder/pre/icons/tick.png,sha256=OedASXJJTYvnza4J6Kv5m5lz6DrBfy667zX_WGgtbmM,9127
-easycoder-260108.1.dist-info/entry_points.txt,sha256=JXAZbenl0TnsIft2FcGJbJ-4qoztVu2FuT8PFmWFexM,44
-easycoder-260108.1.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-easycoder-260108.1.dist-info/WHEEL,sha256=Dyt6SBfaasWElUrURkknVFAZDHSTwxg3PaTza7RSbkY,100
-easycoder-260108.1.dist-info/METADATA,sha256=TE3DyArYVxVehFgAEEOmDyPMHbaYjD-TSie6MiAZfxc,7210
-easycoder-260108.1.dist-info/RECORD,,
+easycoder-260110.1.dist-info/entry_points.txt,sha256=JXAZbenl0TnsIft2FcGJbJ-4qoztVu2FuT8PFmWFexM,44
+easycoder-260110.1.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+easycoder-260110.1.dist-info/WHEEL,sha256=Dyt6SBfaasWElUrURkknVFAZDHSTwxg3PaTza7RSbkY,100
+easycoder-260110.1.dist-info/METADATA,sha256=tBSYXvSYFniI81bT0GZ02cSpWWDjJCLn672BGvZMu-U,7210
+easycoder-260110.1.dist-info/RECORD,,

easycoder/ec_mqtt.py

@@ -1,249 +0,0 @@
-from easycoder import Handler, ECObject, ECValue, ECDictionary, FatalError, RuntimeError
-import paho.mqtt.client as mqtt
-import time
-    
-#############################################################################
-# MQTT client class
-class MQTTClient():
-    def __init__(self):
-        super().__init__()
-
-    def create(self, program, clientID, broker, port, topics):
-        self.program = program
-        self.clientID = clientID
-        self.broker = broker
-        self.port = port
-        self.topics = topics
-        self.onMessagePC = None
-        self.client = mqtt.Client(mqtt.CallbackAPIVersion.VERSION2, client_id=self.clientID) # type: ignore
-    
-        # Setup callbacks
-        self.client.on_connect = self.on_connect
-        self.client.on_message = self.on_message
-
-    def on_connect(self, client, userdata, flags, reason_code, properties):
-        print(f"Client {self.clientID} connected")
-        for item in self.topics:
-            topic = self.program.getObject(self.program.getVariable(item))
-            self.client.subscribe(topic.getName(), qos=topic.getQOS())
-            print(f"Subscribed to topic: {topic.getName()} with QoS {topic.getQOS()}")
-    
-    def on_message(self, client, userdata, msg):
-        # print(f"Message received on topic {msg.topic}: {msg.payload.decode()}")
-        if self.onMessagePC is not None:
-            self.message = msg
-            self.program.run(self.onMessagePC)
-            self.program.flushCB()
-    
-    def getMessageTopic(self):
-        return self.message.topic
-    
-    def getMessagePayload(self):
-        return self.message.payload.decode('utf-8')
-
-    def onMessage(self, pc):
-        self.onMessagePC = pc
-    
-    def sendMessage(self, topic, message, qos):
-        self.client.publish(topic, message, qos=qos)
-    
-    def run(self):
-        self.client.connect(self.broker, int(self.port), 60)
-        self.client.loop_start()
-        
-###############################################################################
-# An MQTT topic
-class ECTopic(ECObject):
-    def __init__(self):
-        super().__init__()
-
-    def create(self, name, qos=1):
-        super().__init__()
-        self.name = name
-        self.qos = qos
-
-    def getName(self):
-        return self.name
-
-    def getQOS(self):
-        return self.qos
-
-###############################################################################
-# The MQTT compiler and rutime handlers
-class MQTT(Handler):
-
-    def __init__(self, compiler):
-        Handler.__init__(self, compiler)
-        self.spoke = None
-
-    def getName(self):
-        return 'mqtt'
-
-    #############################################################################
-    # Keyword handlers
-
-    # init {topic} name {name} qos {qos}
-    def k_init(self, command):
-        if self.nextIsSymbol():
-            record = self.getSymbolRecord()
-            self.checkObjectType(record, ECTopic)
-            command['topic'] = record['name']
-            self.skip('name')
-            command['name'] = self.nextValue()
-            self.skip('qos')
-            command['qos'] = self.nextValue()
-            self.add(command)
-            return True
-        return False
-
-    def r_init(self, command):
-        record = self.getVariable(command['topic'])
-        topic = ECTopic()
-        topic.create(self.textify(command['name']), qos=int(self.textify(command['qos'])))
-        record['object'] = topic
-        return self.nextPC()
-
-    # mqtt id {clientID} broker {broker} port {port} topics {topic} [and {topic} ...]
-    def k_mqtt(self, command):
-        while True:
-            token = self.peek()
-            if token == 'id':
-                self.nextToken()
-                command['clientID'] = self.nextValue()
-            elif token == 'broker':
-                self.nextToken()
-                command['broker'] = self.nextValue()
-            elif token == 'port':
-                self.nextToken()
-                command['port'] = self.nextValue()
-            elif token == 'topics':
-                self.nextToken()
-                topics = []
-                while self.nextIsSymbol():
-                    record = self.getSymbolRecord()
-                    self.checkObjectType(record, ECTopic())
-                    topics.append(record['name'])
-                    if self.peek() == 'and': self.nextToken()
-                    else:break
-                command['topics'] = topics
-            else:
-                self.add(command)
-                return True
-        return False
-
-    def r_mqtt(self, command):
-        if hasattr(self.program, 'mqttClient'):
-            raise RuntimeError(self.program, 'MQQT client already defined')
-        clientID = self.textify(command['clientID'])
-        broker = self.textify(command['broker'])
-        port = self.textify(command['port'])
-        topics = command['topics']
-        client = MQTTClient()
-        client.create(self.program, clientID, broker, port, topics)
-        client.run()
-        self.program.mqttClient = client
-        return self.nextPC()
-
-    # on mqtt message {action}
-    def k_on(self, command):
-        token = self.peek()
-        if token == 'mqtt':
-            self.nextToken()
-            if self.nextIs('message'):
-                self.nextToken()
-                command['goto'] = 0
-                self.add(command)
-                cmd = {}
-                cmd['domain'] = 'core'
-                cmd['lino'] = command['lino']
-                cmd['keyword'] = 'gotoPC'
-                cmd['goto'] = 0
-                cmd['debug'] = False
-                self.add(cmd)
-                # Add the action and a 'stop'
-                self.compileOne()
-                cmd = {}
-                cmd['domain'] = 'core'
-                cmd['lino'] = command['lino']
-                cmd['keyword'] = 'stop'
-                cmd['debug'] = False
-                self.add(cmd)
-                # Fixup the link
-                command['goto'] = self.getCodeSize()
-                return True
-        return False
-
-    def r_on(self, command):
-        self.program.mqttClient.onMessage(self.nextPC()+1)
-        return command['goto']
-
-    # send {message} to {topic}
-    def k_send(self, command):
-        if self.nextIs('mqtt'):
-            command['message'] = self.nextValue()
-            self.skip('from')
-            if self.nextIsSymbol():
-                record = self.getSymbolRecord()
-                self.checkObjectType(record, MQTTClient)
-                command['from'] = record['name']
-            self.skip('to')
-            if self.nextIsSymbol():
-                record = self.getSymbolRecord()
-                self.checkObjectType(record, MQTTClient)
-                command['to'] = record['name']
-            self.add(command)
-            return True
-        return False
-
-    def r_send(self, command):
-        if not hasattr(self.program, 'mqttClient'):
-            raise RuntimeError(self.program, 'No MQTT client defined')
-        topic = self.getObject(self.getVariable(command['to']))
-        message = self.textify(command['message'])
-        self.program.mqttClient.sendMessage(topic.getName(), message, topic.getQOS())
-        return self.nextPC()
-
-    # Declare a topic variable
-    def k_topic(self, command):
-        self.compiler.addValueType()
-        return self.compileVariable(command, 'ECTopic')
-
-    def r_topic(self, command):
-        return self.nextPC()
-
-    #############################################################################
-    # Compile a value in this domain
-    def compileValue(self):
-        token = self.nextToken()
-        if token == 'mqtt':
-            value = ECValue(domain=self.getName())
-            token = self.nextToken()
-            if token in ['topic', 'message']:
-                value.setType(token)
-                return value
-        else:
-            return self.getValue()
-        return None
-
-    #############################################################################
-    # Modify a value or leave it unchanged.
-    def modifyValue(self, value):
-        return value
-
-    #############################################################################
-    # Value handlers
-
-    def v_message(self, v):
-        return self.program.mqttClient.getMessagePayload()
-
-    def v_topic(self, v):
-        return self.program.mqttClient.getMessageTopic()
-
-    #############################################################################
-    # Compile a condition
-    def compileCondition(self):
-        condition = {}
-        return condition
-
-    #############################################################################
-    # Condition handlers