modulitiz-micro 2.38.0__py311-none-any.whl → 2.39.0__py311-none-any.whl

modulitiz_micro/ModuleEnum.py

@@ -0,0 +1,8 @@
+class ModuleEnum(object):
+	@staticmethod
+	def isValueIn(value, enumClass)->bool:
+		try:
+			enumClass(value)
+		except ValueError:
+			return False
+		return True

modulitiz_micro/ModuloFunzioni.py

@@ -38,6 +38,7 @@ class ModuloFunzioni(object):
 	def getClassesFromFileSource(filename:str)->list[str]:
 		"""
 		Reads content of file, then finds all classes in it.
+		Also counts inner classes.
 		"""
 		module=ast.parse(ModuloFiles.readFileText(filename,True))
 		classes=[node.name for node in ast.walk(module) if isinstance(node,ast.ClassDef)]

modulitiz_micro/ModuloMeteo.py

@@ -3,7 +3,7 @@ import json
 from modulitiz_micro.ModuloDate import ModuloDate
 from modulitiz_micro.ModuloListe import ModuloListe
 from modulitiz_micro.eccezioni.http.EccezioneHttpGeneric import EccezioneHttpGeneric
-from modulitiz_micro.files import ModuloLogging
+from modulitiz_micro.files.ModuloLogging import ModuloLogging
 from modulitiz_micro.rete.http.ModuloHttp import ModuloHttp
 from modulitiz_micro.rete.http.ModuloHttpUtils import ModuloHttpUtils
 

modulitiz_micro/ModuloNumeri.py

@@ -52,8 +52,7 @@ class ModuloNumeri(object):
 		Converte una stringa in numero intero.
 		"""
 		try:
-			ris=int(valore)
-			return ris
+			return int(valore)
 		except ValueError:
 			return None
 
@@ -62,9 +61,7 @@ class ModuloNumeri(object):
 		"""
 		Converte un numero intero in valore booleano (o binario).
 		"""
-		if int(valore)==1:
-			return True
-		return False
+		return int(valore)==1
 
 	@staticmethod
 	def boolToInt(valore:bool)->int:

modulitiz_micro/iot/ModuleIotDevice.py

@@ -0,0 +1,46 @@
+from modulitiz_micro.ModuloNumeri import ModuloNumeri
+from modulitiz_micro.ModuloStringhe import ModuloStringhe
+from modulitiz_micro.eccezioni.EccezioneRuntime import EccezioneRuntime
+from modulitiz_micro.eccezioni.http.EccezioneHttp import EccezioneHttp
+from modulitiz_micro.files.ModuloLogging import ModuloLogging
+from modulitiz_micro.iot.beans.IotDeviceBean import IotDeviceBean
+from modulitiz_micro.iot.enums.IotOSEnum import IotOSEnum
+from modulitiz_micro.iot.espurna.ModuleEspurna import ModuleEspurna
+from modulitiz_micro.rete.http.ModuloHttp import ModuloHttp
+
+
+class ModuleIotDevice(object):
+	def __init__(self, logger:ModuloLogging|None, deviceBean:IotDeviceBean):
+		self.__logger=logger
+		self.__deviceBean=deviceBean
+	
+	def getRelayStatus(self, relayNum:int)->bool:
+		"""
+		@param relayNum: Depending on which OS you choose, can be relative (0, 1, ...) or GPIO
+		"""
+		if self.__deviceBean.os==IotOSEnum.ESPURNA:
+			url=ModuleEspurna.URL_GET_RELAY.format(ip=self.__deviceBean.ip,relayNum=relayNum,apiKey=self.__deviceBean.key)
+		else:
+			raise EccezioneRuntime("Iot os '%s' not known"%(self.__deviceBean.os,))
+		return ModuloNumeri.intToBool(ModuloNumeri.strToInt(self.__sendRequest(url)))
+	
+	def setRelayStatus(self, relayNum:int, status:bool):
+		"""
+		@param relayNum: Depending on which OS you choose, can be relative (0, 1, ...) or GPIO
+		@param status: value to set, can only be false or true
+		"""
+		if self.__deviceBean.os==IotOSEnum.ESPURNA:
+			statusStr=str(ModuloNumeri.boolToInt(status))# TODO check if works or if u have to use value 2 (toggle)
+			url=ModuleEspurna.URL_SET_RELAY.format(ip=self.__deviceBean.ip,relayNum=relayNum,apiKey=self.__deviceBean.key,status=statusStr)
+		else:
+			raise EccezioneRuntime("Iot os '%s' not known"%(self.__deviceBean.os,))
+		# TODO: check output
+		self.__sendRequest(url)
+	
+	def __sendRequest(self, url:str)->str:
+		http=ModuloHttp(url,self.__logger,False)
+		http.setUserAgent()
+		bean=http.doGet(0, False)
+		if bean.status!=ModuloHttp.STATUS_OK:
+			raise EccezioneHttp(bean.status)
+		return bean.responseBody.decode(ModuloStringhe.CODIFICA_UTF8)

modulitiz_micro/iot/beans/IotDeviceBean.py

@@ -0,0 +1,13 @@
+from modulitiz_micro.iot.enums.IotOSEnum import IotOSEnum
+
+
+class IotDeviceBean(object):
+	"""
+	Classe che definisce la struttura di una voce complessa del file di configurazione del programma.
+	Elenca le proprietà che identificano un dispositivo/sensore Internet Of Things.
+	"""
+	
+	def __init__(self,ip:str, os:IotOSEnum, key:str):
+		self.ip=ip
+		self.os=os
+		self.key=key

modulitiz_micro/iot/enums/IotOSEnum.py

@@ -0,0 +1,12 @@
+from enum import StrEnum
+from enum import unique
+
+
+@unique
+class IotOSEnum(StrEnum):
+	"""
+	Supported operating systems for Iot devices
+	"""
+	ESPURNA="ESPURNA"
+	TASMOTA="TASMOTA"
+	TIZS="TIZS"

modulitiz_micro/iot/espurna/ModuleEspurna.py

@@ -0,0 +1,3 @@
+class ModuleEspurna(object):
+	URL_GET_RELAY="http://{ip}/api/relay/{relayNum}?apikey={apiKey}"
+	URL_SET_RELAY=URL_GET_RELAY+"&value={status}"

modulitiz_micro/rete/ModuloNetworking.py

@@ -1,4 +1,5 @@
 import os
+import re
 import socket
 from contextlib import closing
 from uuid import getnode
@@ -46,22 +47,26 @@ class ModuloNetworking(object):
 		return False
 
 	@staticmethod
-	def checkPing(indirizzoIp:str)->bool:
-		# costruisco il comando a seconda del sistema operativo
-		comando="ping "
+	def checkPing(ipAddress:str)->bool:
+		# build command
+		cmd="ping "
+		regexPercPacketsLost=r"(\d{1,3})\% "
 		if ModuloSystem.isWindows():
-			comando+="-n"
+			cmd+="-n"
+			regexPercPacketsLost=r"\("+regexPercPacketsLost
 		elif os.name=='posix':
-			comando+="-c"
+			cmd+="-c"
+			regexPercPacketsLost=r", "+regexPercPacketsLost
 		else:
 			raise EccezioneRuntime("Tipologia del sistema operativo non riconosciuta: "+os.name)
-		comando+=" 1 " + indirizzoIp
-		# eseguo il comando
-		outputComando=ModuloStringhe.normalizzaEol(ModuloSystem.systemCallReturnOutput(comando,None))
-		righe=outputComando.split("\n")
-		righe=ModuloListe.eliminaElementiVuoti(righe)
-		for riga in righe:
-			if ModuloStringhe.contains(riga, "%"):
-				numPacchettiPersi=int(riga.split("=")[1].split("(")[0].strip())
-				return numPacchettiPersi==0
+		cmd+=" 1 "+ipAddress
+		# execute command
+		outputComando=ModuloStringhe.normalizzaEol(ModuloSystem.systemCallReturnOutput(cmd,None))
+		rows=outputComando.split("\n")
+		rows=ModuloListe.eliminaElementiVuoti(rows)
+		for row in rows:
+			if ModuloStringhe.contains(row, "%"):
+				regexOutput=re.search(regexPercPacketsLost,row)
+				if regexOutput is not None:
+					return int(regexOutput.group(1).strip())==0
 		return False

modulitiz_micro/rete/http/ModuloHttp.py

@@ -83,6 +83,7 @@ class ModuloHttp(object):
 			ctx=ssl.create_default_context()
 			ctx.check_hostname=False
 			ctx.verify_mode=ssl.CERT_NONE
+		# send request
 		with urllib.request.urlopen(self.__requestObj,context=ctx) as response:
 			responseBody=response.read()
 			responseHeaders=response.info()

modulitiz_micro/util/wheel/ModuloBuildWheel.py

@@ -47,15 +47,15 @@ class ModuloBuildWheel(object):
 		{}""".format(ModuloColorText.GRASSETTO,msg,self.versionOld,ModuloColorText.DEFAULT))
 		# change dir
 		os.chdir(self.percorsoCartellaSource)
-		if self.__doUnitTests() is True:
+		if self.__doUnitTests():
 			return
 		# aggiorno versione
 		self.moduloToml.updateVersion(self.versionNew)
 		# building wheel
 		ModuloSystem.systemCallPrintOutput(f'{self.CMD_PYTHON} -m pip install -U build twine==6.0.1',None)
 		print()
-		percorsoCartellaOut=ModuloFiles.pathJoin(self.percorsoCartellaRoot,"wheel")
-		cmd='{} -m build --wheel --outdir "{}"'.format(self.CMD_PYTHON,percorsoCartellaOut)
+		pathFolderWheel=ModuloFiles.pathJoin(self.percorsoCartellaRoot,"wheel")
+		cmd='{} -m build --wheel --outdir "{}"'.format(self.CMD_PYTHON,pathFolderWheel)
 		ModuloSystem.systemCallPrintOutput(cmd,None)
 		# deleting temporary dirs
 		print()
@@ -63,15 +63,16 @@ class ModuloBuildWheel(object):
 		shutil.rmtree(ModuloFiles.pathJoin(self.percorsoCartellaSource,self.moduleName+".egg-info"))
 		# install wheel
 		self.filenameWheel=self.PATTERN_NOMEFILE_WHEEL.format(self.moduleName,self.versionNew,self.moduloToml.retrieveMinPyVersion())
-		percorsoWheel=ModuloFiles.pathJoin(percorsoCartellaOut,self.filenameWheel)
+		percorsoWheel=ModuloFiles.pathJoin(pathFolderWheel,self.filenameWheel)
 		cmd='{} -m pip install -U "{}"'.format(self.CMD_PYTHON,percorsoWheel)
 		ModuloSystem.systemCallPrintOutput(cmd,None)
+		# upload to web
 		print()
 		print("Uploading to Pypi")
 		cmd='{} -m twine upload "{}"'.format(self.CMD_PYTHON,percorsoWheel)
 		ModuloSystem.systemCallPrintOutput(cmd,None)
 		# delete wheel
-		os.remove(percorsoWheel)
+		shutil.rmtree(pathFolderWheel)
 	
 	def __doUnitTests(self) -> bool:
 		if self.skipUnitTest:

modulitiz_micro/util/wheel/ModuloCheckTestNamingConvention.py

@@ -51,11 +51,14 @@ class ModuloCheckTestNamingConvention(object):
 			return
 		# file name must match class name
 		testClasses=ModuloFunzioni.getClassesFromFileSource(filenameAbs)
+		if len(testClasses)==0:
+			self.errors.append("File must contain at least 1 class: %s"%(filenameRel,))
+			return
 		if len(testClasses)>1:
 			self.errors.append("File must not contain more than 1 class: %s"%(filenameRel,))
 			return
 		baseFilename=ModuloFiles.getBaseFileNameAndExtension(filename)[0]
-		testClassName=None
+		testClassName:str|None=None
 		if not isDecorator:
 			testClassName=testClasses[0]
 			if testClassName!=baseFilename:
@@ -68,6 +71,9 @@ class ModuloCheckTestNamingConvention(object):
 			return
 		# source class name must equals class test
 		if not isDecorator:
+			if ModuloStringhe.isEmpty(testClassName):
+				self.errors.append("Test class name doesn't match source class name: %s"%(filenameRel,))
+				return
 			sourceClassName=ModuloFunzioni.getClassesFromFileSource(ModuloFiles.pathJoin(self.pathSource,sourceFilenameRel))[0]
 			if not testClassName.startswith(sourceClassName):
 				self.errors.append("Test class name doesn't match source class name: %s"%(filenameRel,))

{modulitiz_micro-2.38.0.dist-info → modulitiz_micro-2.39.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: modulitiz_micro
-Version: 2.38.0
+Version: 2.39.0
 Summary: Raccolta dei miei moduli - versione micro
 Author-email: tiz <sderfo1234@altervista.org>
 Classifier: Programming Language :: Python :: 3

{modulitiz_micro-2.38.0.dist-info → modulitiz_micro-2.39.0.dist-info}/RECORD

@@ -1,10 +1,11 @@
+modulitiz_micro/ModuleEnum.py,sha256=1HVhYspeTyE8nEuYSDkQXuRUISEggR_Cejqn3uGMOPQ,159
 modulitiz_micro/ModuloBase64.py,sha256=dW1TP8TkIuOqAbbJcvTAo4xEurHl8NBs8lQTuHY_HaU,1866
 modulitiz_micro/ModuloColorText.py,sha256=_sMSh9xZ-qbpa35oaSGdzQJKpFiGLsCHtM4P1HQWcTE,828
 modulitiz_micro/ModuloDate.py,sha256=niDdyhWUkRNOfxK7G-RkvvuGJdPCCJRpL3-TFZiuUOE,7997
-modulitiz_micro/ModuloFunzioni.py,sha256=K-8rwVeSEgKCCLQSIXVHZ69YhLRCy3ILYxZXZOy95eI,1947
+modulitiz_micro/ModuloFunzioni.py,sha256=n2wNRCLg-l2EvUtZu2K2yT-oE9XJN8nYSDjzECYVqNw,1977
 modulitiz_micro/ModuloListe.py,sha256=aWqnJX2JAk_LApUQvObkc6P89qXJzFviljJeKa39KC8,3581
-modulitiz_micro/ModuloMeteo.py,sha256=Tr3lRW-lvk9XKm_M-ZvohJ6ueA9oA4TbP6BaZVeCl60,2310
-modulitiz_micro/ModuloNumeri.py,sha256=aWTKRwVzFSXKZ7GGwJjl6xFZIE3xgAgq6cezVLw1qwM,2806
+modulitiz_micro/ModuloMeteo.py,sha256=uiENrmpkRVFX-qaFoxH5BfuEkob-1KqiVmXd734qeCk,2324
+modulitiz_micro/ModuloNumeri.py,sha256=0r2t8QHM_e-8GpFg_jvPEnb2QWlwJ0eVTMKDnak9nV0,2765
 modulitiz_micro/ModuloPyinstaller.py,sha256=TiDtOsDAYkK1EVXNC0qWVCgBoCo2puH6HIVL6gMLqAw,845
 modulitiz_micro/ModuloSeriale.py,sha256=k9po45AFiYc4d-j4BHQsaQFakW8Vs-ZlHu5Bxk7AaDg,1895
 modulitiz_micro/ModuloStatistiche.py,sha256=ANDTatAfDxGfxN5ZusQxWZnqjUCA8z_kPyQR69sCJ_w,1316
@@ -47,6 +48,10 @@ modulitiz_micro/files/git/exceptions/EccezioneGit.py,sha256=SfBBBvfo7XXJeUYpF61I
 modulitiz_micro/gestionedom/GestioneDom.py,sha256=LjmFKiBLNc0yn9m7Z27u2rpU4UcF9778Ljm8aYhdBcY,1350
 modulitiz_micro/init/AbstractBasicInit.py,sha256=hp2U5ZSIaWtwMuohlsk2WHjPRKxJrQyavPsLPlbejtQ,582
 modulitiz_micro/init/AbstractInit.py,sha256=0dxk2o6Sx3Ii4UzYvIMeWOClxdbmctO3M4XoMpk2v7k,228
+modulitiz_micro/iot/ModuleIotDevice.py,sha256=O9rciBfaE7ImrbCoCvJfEampwK7J_ntKuxIkf40DW70,2108
+modulitiz_micro/iot/beans/IotDeviceBean.py,sha256=lSxK80JW3PmhlbKMNX8-U1fjwciFp_MaxH8jYtJLGas,374
+modulitiz_micro/iot/enums/IotOSEnum.py,sha256=jMGWbPo0gafFdog7f9VBX_vJQ86XiXYUcxVg-RM9-s8,191
+modulitiz_micro/iot/espurna/ModuleEspurna.py,sha256=ueL-hDpaGzmU7mUvpLmu3YerJCJqrfTzATfOVeasD9I,142
 modulitiz_micro/keylogger/EccezioneKeyLogger.py,sha256=BEhO2y8haOBfuboJHkZI_FyTmFsVw_uHKkQvjyBFkbk,212
 modulitiz_micro/keylogger/ModuloKeylogger.py,sha256=7envuMiJVPGWDTzy9iq8tc9fPj1UKuaOfFz6viR8eDQ,1939
 modulitiz_micro/multithread/ModuloThread.py,sha256=BB9t6tCGjDT4JuoEQ61AJmYiqY-oycjub3zq9gFVI_E,982
@@ -54,11 +59,11 @@ modulitiz_micro/multithread/ModuloThreadLogger.py,sha256=oQql4C3qrqOUksvcdrgZxgW
 modulitiz_micro/multithread/ModuloThreadWithCallbackError.py,sha256=RQWfLDssdVmXoewrWaCdVSrySjbElh2iNBqlSslg0W8,724
 modulitiz_micro/nlp/ModuloNlp.py,sha256=h7ca9kVLKRcqHMK6rCVOambdpPfh-ehVSppP2nYGxVA,799
 modulitiz_micro/nlp/ModuloNlpDateAndTime.py,sha256=QCURYksP4-z_u03CVzcESLp5EtdIx2GNXDNYgYOPGuU,1851
-modulitiz_micro/rete/ModuloNetworking.py,sha256=ouaArJo-sc_eKrTaJW3rzk6zLtNtpfI8YGHQboi_urE,1999
+modulitiz_micro/rete/ModuloNetworking.py,sha256=3tatSHP4s2AeBBZM4nsyZFHdhlXhNIG16C1SsCb6xYk,2114
 modulitiz_micro/rete/ModuloOpenVpn.py,sha256=t99ofIYhM7q3HnQrvzQbx-6JeyDQqOc1wvg7pxvYo8U,627
 modulitiz_micro/rete/email/EmailBean.py,sha256=EOKLfBVqwBEkbWfywiUmk2iB5K2uVlykxsh4zB9red8,168
 modulitiz_micro/rete/email/ModuloEmail.py,sha256=6roT23q15xmo_olXORF19PRwss81tQg-71gGquvs28A,2956
-modulitiz_micro/rete/http/ModuloHttp.py,sha256=4IPwfUjwYHHBTavLxnAULOVetKpcE_kFLESWUFgO3w4,4693
+modulitiz_micro/rete/http/ModuloHttp.py,sha256=i7Zfu9aYT14AQpggW2GBdcGRtyHnBfxyjcuuWshPS5s,4711
 modulitiz_micro/rete/http/ModuloHttpConnectionSafe.py,sha256=w1cLQrnPJXltUeJ4OOtFOTPv5k0J6uNqlrXUzO0UbX4,2936
 modulitiz_micro/rete/http/ModuloHttpUtils.py,sha256=9r6Z4eT4j4ZH-UyjOQXz_vUaltW-oH9gyyQLZDgVf7s,2350
 modulitiz_micro/rete/http/beans/HttpResponseBean.py,sha256=7JVywcWURv1I9rYKj4Kt9XLt7387wMZGTMefcsm7E3I,202
@@ -93,12 +98,12 @@ modulitiz_micro/util/spooler/eccezioni/EccezioneSpoolerFull.py,sha256=KEcDisixOS
 modulitiz_micro/util/unittesting/AbstractOverrideTestUtil.py,sha256=5YX20I-rhl6TpRrqSdNafI1cqBAdTs2sgtOTDjzDn5k,754
 modulitiz_micro/util/unittesting/AbstractTestUtil.py,sha256=AW9mCj8i_qHrigcXcvvjgdLxa-4Ce0jrwJEZqpPVBxY,297
 modulitiz_micro/util/unittesting/ModuloRunUnitTest.py,sha256=_YHxjTk_t9wvlCYgS4HSQ657ht7ekSRQsH7i1aKw1LY,774
-modulitiz_micro/util/wheel/ModuloBuildWheel.py,sha256=eEnozE5OZGXEMQq9fujhS5tHrzSIQ25lkFTtAt5DAoo,4781
-modulitiz_micro/util/wheel/ModuloCheckTestNamingConvention.py,sha256=2J3yE6Ba2EyhXSzH5gcmxHnEUOSGOin9dW_Q6dADsXM,3606
+modulitiz_micro/util/wheel/ModuloBuildWheel.py,sha256=OtZdKTiiU0XhrIjWaFlBx8denZXwWIe-V794YUi8WcE,4786
+modulitiz_micro/util/wheel/ModuloCheckTestNamingConvention.py,sha256=ZGwMtVexRscwVEtiwxgU5ENsItcfsV2NEAcyclcLFgA,3885
 modulitiz_micro/util/wheel/ModuloToml.py,sha256=774GQ8y6lyhOrT0edJPlLq4TBU7Nq4699q74deGlFW4,1205
 modulitiz_micro/util/wheel/ModuloWheel.py,sha256=VRS_6kSt62qubBYzkGm91_GWzcIiD0KlSnaqhM_aQnE,338
-modulitiz_micro-2.38.0.dist-info/LICENSE,sha256=b-Ia9Hv3N_FviXoFAXG44lDGbk4tCC0fBdduccm8nl0,1086
-modulitiz_micro-2.38.0.dist-info/METADATA,sha256=DC7-csHBAdlOGvjt3FXixzhQkp9DlaMdXF7gOFc9ETg,1690
-modulitiz_micro-2.38.0.dist-info/WHEEL,sha256=2aRSX09k7pmd4gPs96VOQ860h0v0t30ka6JGHtpC3BY,94
-modulitiz_micro-2.38.0.dist-info/top_level.txt,sha256=ESJE0qtNJp3tbKPrffbFVjH511NSjJHxscfpdLjTpA8,16
-modulitiz_micro-2.38.0.dist-info/RECORD,,
+modulitiz_micro-2.39.0.dist-info/LICENSE,sha256=b-Ia9Hv3N_FviXoFAXG44lDGbk4tCC0fBdduccm8nl0,1086
+modulitiz_micro-2.39.0.dist-info/METADATA,sha256=nWExoZuR-JAq9R53bpezFLNMOe86Mktd2P0MNxbAF0I,1690
+modulitiz_micro-2.39.0.dist-info/WHEEL,sha256=2aRSX09k7pmd4gPs96VOQ860h0v0t30ka6JGHtpC3BY,94
+modulitiz_micro-2.39.0.dist-info/top_level.txt,sha256=ESJE0qtNJp3tbKPrffbFVjH511NSjJHxscfpdLjTpA8,16
+modulitiz_micro-2.39.0.dist-info/RECORD,,