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

modulitiz_micro/ModuloDate.py

@@ -5,6 +5,9 @@ from datetime import datetime
 from datetime import time as dt_time
 from datetime import timedelta
 from datetime import timezone
+from datetime import tzinfo
+
+from suntime import Sun
 
 
 class ModuloDate(object):
@@ -18,6 +21,7 @@ class ModuloDate(object):
 	FORMATO_DATA_ORA_NOMEFILE="%Y-%m-%d_%H-%M-%S"
 	FORMATO_DATA_ORA_NOSPAZI="%Y%m%d%H%M%S"
 	FORMATO_ORA="%H:%M:%S"
+	FORMAT_HH_MM="%H:%M"
 	
 	
 	@staticmethod
@@ -268,21 +272,49 @@ class ModuloDate(object):
 		return cls.setTimezoneFromTzInfo(data,timezone.utc)
 	
 	@staticmethod
-	def setTimezoneFromTzInfo(data:datetime,tz:datetime.tzinfo)->datetime:
+	def setTimezoneFromTzInfo(data:datetime,tz:tzinfo)->datetime:
 		"""
 		Imposta un fuso orario ad una data completa.
 		"""
 		return data.replace(tzinfo=tz)
 	
 	@classmethod
-	def getTimezoneLocal(cls)->datetime.tzinfo:
+	def getTimezoneLocal(cls,dateTime:datetime|None=None)->tzinfo:
 		"""
-		Ritorna il fuso orario locale.
+		Ritorna il fuso orario locale + DST.
 		"""
-		return cls.now().astimezone().tzinfo
+		if dateTime is None:
+			dateTime=cls.now()
+		return dateTime.astimezone().tzinfo
+	
+	@staticmethod
+	def isDst(dateTime:datetime)->bool:
+		return time.localtime(ModuloDate.dateToTimestamp(dateTime)).tm_isdst==1
+	
+	@classmethod
+	def getDstSeconds(cls,dateTime:datetime)->int:
+		return 3600 if cls.isDst(dateTime) else 0
+	
+	#
+	# sunrise / sunset
+	#
+	
+	@classmethod
+	def getLocalSunrise(cls,lat:float,long:float,dateTime:datetime|None=None)->datetime:
+		if dateTime is None:
+			dateTime=cls.now()
+		sun=Sun(lat,long)
+		return sun.get_sunrise_time(dateTime,cls.getTimezoneLocal(dateTime))
+	
+	@classmethod
+	def getLocalSunset(cls,lat:float,long:float,dateTime:datetime|None=None)->datetime:
+		if dateTime is None:
+			dateTime=cls.now()
+		sun=Sun(lat,long)
+		return sun.get_sunset_time(dateTime,cls.getTimezoneLocal(dateTime))
 	
 	#
-	# altre funzioni
+	# others
 	#
 	@classmethod
 	def calculateElapsedSecs(cls,millisInizio:int)->str:

modulitiz_micro/iot/ModuleIotDevice.py

@@ -24,18 +24,34 @@ class ModuleIotDevice(object):
 			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):
+	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
 		"""
+		self.__setRelayStatus(relayNum,status)
+	
+	def setRelayStatusToggle(self,relayNum: int):
+		self.__setRelayStatus(relayNum,None)
+	
+	def __setRelayStatus(self, relayNum:int, status:bool|None):
+		"""
+		@param relayNum: Depending on which OS you choose, can be relative (0, 1, ...) or GPIO
+		@param status: value to set, can be: false = off, true = on, null/None = toggle
+		"""
 		if self.__deviceBean.os==IotOSEnum.ESPURNA:
-			statusStr=str(ModuloNumeri.boolToInt(status))# TODO check if works or if u have to use value 2 (toggle)
+			if status is not None:
+				statusStr=str(ModuloNumeri.boolToInt(status))
+			else:
+				statusStr=2
 			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)
+		# check output
+		statusOutput=ModuloNumeri.intToBool(int(self.__sendRequest(url)))
+		if status is None or status==statusOutput:
+			return
+		raise EccezioneRuntime("Wrong expected status: %d != %d"%(status,statusOutput))
 	
 	def __sendRequest(self, url:str)->str:
 		http=ModuloHttp(url,self.__logger,False)

modulitiz_micro/util/scheduler/{AbstractScheduler.py → ModuleScheduler.py}

@@ -1,15 +1,9 @@
-from abc import ABC
-
 import schedule
 
 from modulitiz_micro.ModuloListe import ModuloListe
 
 
-class AbstractScheduler(ABC):
-	
-	def __init__(self):
-		super().__init__()
-	
+class ModuleScheduler(object):
 	@staticmethod
 	def cancelJobByTag(tag:str):
 		schedule.clear(tag)

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: modulitiz_micro
-Version: 2.39.0
+Version: 2.41.0
 Summary: Raccolta dei miei moduli - versione micro
 Author-email: tiz <sderfo1234@altervista.org>
 Classifier: Programming Language :: Python :: 3
@@ -25,6 +25,7 @@ Requires-Dist: pypyodbc>=1.3
 Requires-Dist: pyserial>=3.5
 Requires-Dist: requests>=2.31
 Requires-Dist: schedule>=1.2
+Requires-Dist: suntime==1.3.2
 Requires-Dist: telethon>=1.33
 Requires-Dist: webcolors>=1.13
 

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

@@ -1,7 +1,7 @@
 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/ModuloDate.py,sha256=9SbLsonm3PAobbLB-KLnOcGej9Eze7yLQTWXMb82BHY,8894
 modulitiz_micro/ModuloFunzioni.py,sha256=n2wNRCLg-l2EvUtZu2K2yT-oE9XJN8nYSDjzECYVqNw,1977
 modulitiz_micro/ModuloListe.py,sha256=aWqnJX2JAk_LApUQvObkc6P89qXJzFviljJeKa39KC8,3581
 modulitiz_micro/ModuloMeteo.py,sha256=uiENrmpkRVFX-qaFoxH5BfuEkob-1KqiVmXd734qeCk,2324
@@ -48,7 +48,7 @@ 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/ModuleIotDevice.py,sha256=tDh76kq_lOCGnb_7sF2QZbjbba8p1o8XJZ1YOgTaMmA,2650
 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
@@ -88,7 +88,7 @@ modulitiz_micro/util/beans/globalvar/AbstractGlobalVarBean.py,sha256=YrjrR2Ao86y
 modulitiz_micro/util/decorators/noAwait.py,sha256=O9g_-4jSoLUjISslDRMlcvE91OtY2EkqcJKDDZxckDg,536
 modulitiz_micro/util/pip/AbstractModuloPip.py,sha256=JwdRmKMBIk28QctAf8OKR6SrgFfEfacGw3aQMFT-5XM,1254
 modulitiz_micro/util/pip/ModuloPip.py,sha256=PhgOdO_jZPJW0J2-Js9fQ3rVFbAks4ZD1oazhx9p1Os,1983
-modulitiz_micro/util/scheduler/AbstractScheduler.py,sha256=JTX39slhcaigiZUUUXKdUed4y0Vhom2Ldi61Zt0LSSE,668
+modulitiz_micro/util/scheduler/ModuleScheduler.py,sha256=QPlvdLYXMhywxXRmEOoztLd5j2MbBpbxmptDF7Eu7CI,596
 modulitiz_micro/util/spooler/AbstractSpooler.py,sha256=suJSAdevgZYErqwOTmM9b_fQEZSyJwD2Y11grCFpf5I,295
 modulitiz_micro/util/spooler/Spooler.py,sha256=pAqm-L3KyR7LRuw10RTVqf8DZNiEFS1KeA9q9wuqbz4,430
 modulitiz_micro/util/spooler/beans/QueueBean.py,sha256=HjfK17XpyUUYYXTNS5q56iyBdqGoFQeP_DcQadtZJFY,150
@@ -102,8 +102,8 @@ modulitiz_micro/util/wheel/ModuloBuildWheel.py,sha256=OtZdKTiiU0XhrIjWaFlBx8denZ
 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.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,,
+modulitiz_micro-2.41.0.dist-info/LICENSE,sha256=b-Ia9Hv3N_FviXoFAXG44lDGbk4tCC0fBdduccm8nl0,1086
+modulitiz_micro-2.41.0.dist-info/METADATA,sha256=ESKfsw1ErqgtcNju2Ul_1QQKlhudIZ4AGS__GoM4tv0,1721
+modulitiz_micro-2.41.0.dist-info/WHEEL,sha256=2aRSX09k7pmd4gPs96VOQ860h0v0t30ka6JGHtpC3BY,94
+modulitiz_micro-2.41.0.dist-info/top_level.txt,sha256=ESJE0qtNJp3tbKPrffbFVjH511NSjJHxscfpdLjTpA8,16
+modulitiz_micro-2.41.0.dist-info/RECORD,,