modulitiz-micro 2.44.0__py311-none-any.whl → 2.44.1__py311-none-any.whl

modulitiz_micro/rete/http/huawei/fusionsolar/ModuleHuaweiFusionSolar.py

@@ -61,11 +61,11 @@ class ModuleHuaweiFusionSolar(AbstractHuaweiFusionSolar):
 	
 	def getRealtimeProductionWh(self) -> int:
 		"""
-		Get total realtime production in Kwh.
+		Get total realtime production in Wh.
 		"""
 		results=self.getRealtimeDataResidentialInverter()
-		productionWh=[x.pv1_u*x.pv1_i for x in results]
-		return int(sum(productionWh))
+		whProductions=[x.pv1_u*x.pv1_i for x in results]
+		return int(sum(whProductions))
 	
 	def getRealtimeDataResidentialInverter(self)->list[DeviceDataResidentialInverter]:
 		elems=[]

modulitiz_micro/weather/AbstractModuleWeather.py

@@ -0,0 +1,31 @@
+import json
+from abc import ABC
+
+from modulitiz_micro.eccezioni.http.EccezioneHttpGeneric import EccezioneHttpGeneric
+from modulitiz_micro.rete.http.ModuloHttp import ModuloHttp
+from modulitiz_micro.rete.http.ModuloHttpUtils import ModuloHttpUtils
+from modulitiz_nano.files.ModuloLogging import ModuloLogging
+
+
+class AbstractModuleWeather(ABC):
+	OPTIONS="lang=it&units=metric"
+	KEY="appid=e28cd365c35c12e3ed8f2d84e04398c9"
+	
+	__BASE_URL="https://api.openweathermap.org"
+	URL_CURRENT=__BASE_URL+f"/data/2.5/weather?{OPTIONS}&{KEY}&q="
+	URL_FORECAST=__BASE_URL+f"/data/2.5/forecast?{OPTIONS}&{KEY}&q="
+	
+	def __init__(self,logger:ModuloLogging):
+		self._logger=logger
+	
+	def _makeForecastRequest(self,baseUrl:str,city:str,codState:str):
+		return self._makeGenericRequest(baseUrl,city, codState)['list']
+	
+	def _makeGenericRequest(self,baseUrl:str,city:str,codState:str):
+		url=baseUrl+ModuloHttpUtils.encodeUrl(city+","+codState)
+		http=ModuloHttp(url,self._logger,False)
+		try:
+			response=http.doGet(0,False)
+		except EccezioneHttpGeneric:
+			return None
+		return json.loads(response.responseBody)

modulitiz_micro/weather/ModuleWeather.py

@@ -0,0 +1,62 @@
+from modulitiz_micro.weather.AbstractModuleWeather import AbstractModuleWeather
+from modulitiz_nano.ModuloDate import ModuloDate
+from modulitiz_nano.ModuloListe import ModuloListe
+
+
+class ModuleWeather(AbstractModuleWeather):
+	"""
+	Utility for current weather and forecasts.
+	"""
+	OPTIONS="lang=it&units=metric"
+	KEY="appid=e28cd365c35c12e3ed8f2d84e04398c9"
+	
+	__BASE_URL="https://api.openweathermap.org"
+	URL_CURRENT=__BASE_URL+f"/data/2.5/weather?{OPTIONS}&{KEY}&q="
+	URL_FORECAST=__BASE_URL+f"/data/2.5/forecast?{OPTIONS}&{KEY}&q="
+	
+	def __init__(self,*args,**kwargs):
+		super().__init__(*args,**kwargs)
+	
+	def getCurrent(self,city:str,codState:str)-> dict:
+		return self._makeGenericRequest(self.URL_CURRENT,city,codState)
+	
+	def getForecastRainUntilTomorrow(self,city:str,codState:str)-> list|None:
+		"""
+		Chiede le previsioni fino al giorno dopo e mostra solo i risultati che dicono che pioverà.
+		"""
+		now=ModuloDate.now()
+		tomorrow=ModuloDate.setEndOfDay(ModuloDate.plusMinusDays(now,1))
+		hoursDiff=ModuloDate.hoursDiff(tomorrow, now)
+		elements=self.__getForecasts(city, codState,True,None,hoursDiff)
+		if elements is None:
+			return None
+		# filter elements
+		results=[]
+		for elem in elements:
+			if ModuloListe.collectionSafeGet(elem,'rain') is not None:
+				results.append(elem)
+		return results
+	
+	def __getForecasts(self,city:str,codState:str,includeFirstForecast:bool,stepHours: int|None,maxHours:int)-> list|None:
+		results=self._makeForecastRequest(self.URL_FORECAST,city,codState)
+		maxLista=len(results)
+		# calculate indexes
+		if maxHours is not None:
+			maxInd=int(maxHours/3)+1
+			if maxInd>=maxLista:
+				maxInd=maxLista-1
+		else:
+			maxInd=maxLista-1
+		if stepHours is None:
+			step=1
+		else:
+			step=int(stepHours/3)
+		inds=list(range(4,maxInd,step))
+		if includeFirstForecast:
+			inds.insert(0,1)
+		# process json
+		output=[]
+		for ind in inds:
+			elem=results[ind]
+			output.append(elem)
+		return output

{modulitiz_micro-2.44.0.dist-info → modulitiz_micro-2.44.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modulitiz_micro
-Version: 2.44.0
+Version: 2.44.1
 Summary: Raccolta dei miei moduli - versione micro
 Author-email: tiz <sderfo1234@altervista.org>
 Classifier: Programming Language :: Python :: 3
@@ -21,7 +21,7 @@ Requires-Dist: pyOpenSSL==25.1.0
 Requires-Dist: pypyodbc>=1.3
 Requires-Dist: pyserial>=3.5
 Requires-Dist: requests>=2.31
-Requires-Dist: schedule>=1.2
+Requires-Dist: schedule==1.2.2
 Requires-Dist: telethon>=1.33
 Dynamic: license-file
 

{modulitiz_micro-2.44.0.dist-info → modulitiz_micro-2.44.1.dist-info}/RECORD

@@ -1,4 +1,3 @@
-modulitiz_micro/ModuloMeteo.py,sha256=U4H6IhsUGXLn2N_6MY-1Ti8YDDIwrKea-u2Ojx_7WAA,2321
 modulitiz_micro/ModuloSeriale.py,sha256=k99YGWXOtEt44Q4mDE40IEeqMYGWfLC0LiPmgW63r-g,1878
 modulitiz_micro/ModuloTarghe.py,sha256=FMKFtWUtQEB1IBnmUMwWhznxWitx_S7dJf0LsQsecaI,1369
 modulitiz_micro/database/AbstractDatabaseService.py,sha256=RcSQgGZf-RHT0NzOTF1S35yf0nWOb93SzqSs1Rf2NbQ,269
@@ -38,7 +37,7 @@ modulitiz_micro/rete/http/ModuloHttpConnectionSafe.py,sha256=hhSQgDpXpcGXgWl14Dx
 modulitiz_micro/rete/http/ModuloHttpUtils.py,sha256=T-Yp_T-oqfwUDFokIYGOeO7a1lSGVsZesjDPhgDBbLM,2348
 modulitiz_micro/rete/http/beans/HttpResponseBean.py,sha256=7JVywcWURv1I9rYKj4Kt9XLt7387wMZGTMefcsm7E3I,202
 modulitiz_micro/rete/http/decorators/catchAndRaiseHttpExceptions.py,sha256=MRhCeNMcy3hw-A8W40gozUY0FiL0tyKASauA7hRW0fo,595
-modulitiz_micro/rete/http/huawei/fusionsolar/ModuleHuaweiFusionSolar.py,sha256=14SSbVHh7W-k6n6HJ50RbdFmrUPo32jp5fW_vgHmmXY,3255
+modulitiz_micro/rete/http/huawei/fusionsolar/ModuleHuaweiFusionSolar.py,sha256=SXutHgWJ-CyC3LmDn36iixXLYY6fcqZJp8Od7mLbhQ4,3256
 modulitiz_micro/rete/http/huawei/fusionsolar/beans/TokenBean.py,sha256=fVtnXYBcaahsOgNnbfZWir4KJVVAZcj5Y0MplMOESnU,700
 modulitiz_micro/rete/http/huawei/fusionsolar/beans/device/DeviceBean.py,sha256=dEtC46PySPhUQDGDB4L1FtCDS2BG98uCietcIbpXLdM,98
 modulitiz_micro/rete/http/huawei/fusionsolar/beans/device/DeviceDataBattery.py,sha256=7tugell4ZRhOXqIEuRcL6F-JHHRVBMiJ4fTeo-ckDfM,542
@@ -58,8 +57,10 @@ modulitiz_micro/social/telegram/AbstractModuloTelegram.py,sha256=e1XSZse1GFsNYjd
 modulitiz_micro/social/telegram/ModuloTelegramSimple.py,sha256=TLWx64pl26cTno3pJHZu0Zt86ZEOYF2Lp5mQt1eekbY,938
 modulitiz_micro/util/beans/globalvar/AbstractBasicGlobalVarBean.py,sha256=eR6B-zTSbuZcdDsmcz4axhvKgAWLfYnWUCLdbx7OR_E,510
 modulitiz_micro/util/scheduler/ModuleScheduler.py,sha256=kLxTfr-YPWZB-4XevNxQg71sSLbpakrRPOXLDjJ8JV4,595
-modulitiz_micro-2.44.0.dist-info/licenses/LICENSE,sha256=b-Ia9Hv3N_FviXoFAXG44lDGbk4tCC0fBdduccm8nl0,1086
-modulitiz_micro-2.44.0.dist-info/METADATA,sha256=4h8k8PcTNlYCPeIdjPBi7U7kly0LuQJBDYJ6O-J-39k,1577
-modulitiz_micro-2.44.0.dist-info/WHEEL,sha256=cRWFNt_CJSuf6BnJKAdKunDXUJxjAbWvbt_kstDCs1I,93
-modulitiz_micro-2.44.0.dist-info/top_level.txt,sha256=ESJE0qtNJp3tbKPrffbFVjH511NSjJHxscfpdLjTpA8,16
-modulitiz_micro-2.44.0.dist-info/RECORD,,
+modulitiz_micro/weather/AbstractModuleWeather.py,sha256=SBb2oE_5-g6yvE4wbqI1RTgrqIGWbDgvL8kaMNkw9Vo,1129
+modulitiz_micro/weather/ModuleWeather.py,sha256=mipt91hQGztWPy5hUkz5vYnAJ1nYyL9fR9zS4WUICa8,2000
+modulitiz_micro-2.44.1.dist-info/licenses/LICENSE,sha256=b-Ia9Hv3N_FviXoFAXG44lDGbk4tCC0fBdduccm8nl0,1086
+modulitiz_micro-2.44.1.dist-info/METADATA,sha256=O6UII-nZztUa9oqEuc-b3lr9zdtWBgANtrZImiJ33mE,1579
+modulitiz_micro-2.44.1.dist-info/WHEEL,sha256=cRWFNt_CJSuf6BnJKAdKunDXUJxjAbWvbt_kstDCs1I,93
+modulitiz_micro-2.44.1.dist-info/top_level.txt,sha256=ESJE0qtNJp3tbKPrffbFVjH511NSjJHxscfpdLjTpA8,16
+modulitiz_micro-2.44.1.dist-info/RECORD,,

modulitiz_micro/ModuloMeteo.py

@@ -1,72 +0,0 @@
-import json
-
-from modulitiz_nano.ModuloDate import ModuloDate
-from modulitiz_nano.ModuloListe import ModuloListe
-from modulitiz_micro.eccezioni.http.EccezioneHttpGeneric import EccezioneHttpGeneric
-from modulitiz_nano.files.ModuloLogging import ModuloLogging
-from modulitiz_micro.rete.http.ModuloHttp import ModuloHttp
-from modulitiz_micro.rete.http.ModuloHttpUtils import ModuloHttpUtils
-
-
-class ModuloMeteo(object):
-	"""
-	Utility di gestione delle previsioni meteo.
-	"""
-	OPZIONI="lang=it&units=metric"
-	KEY="appid=e28cd365c35c12e3ed8f2d84e04398c9"
-	
-	__URL_BASE="https://api.openweathermap.org"
-	URL_ATTUALE=__URL_BASE+f"/data/2.5/weather?{OPZIONI}&{KEY}&q="
-	URL_PREVISIONE=__URL_BASE+f"/data/2.5/forecast?{OPZIONI}&{KEY}&q="
-	
-	def __init__(self,logger:ModuloLogging):
-		self.__logger=logger
-	
-	def getPrevisionePioggiaFinoADomani(self,citta:str,codStato:str)->list|None:
-		"""
-		Chiede le previsioni fino al giorno dopo e mostra solo i risultati che dicono che pioverà.
-		"""
-		adesso=ModuloDate.now()
-		domani=ModuloDate.setEndOfDay(ModuloDate.plusMinusDays(adesso,1))
-		oreDiff=ModuloDate.hoursDiff(domani, adesso)
-		elementi=self.__getPrevisioni(citta, codStato,True,None,oreDiff)
-		if elementi is None:
-			return None
-		# filtro gli elementi
-		lista=[]
-		for elem in elementi:
-			if ModuloListe.collectionSafeGet(elem,'rain') is not None:
-				lista.append(elem)
-		return lista
-	
-	def __getPrevisioni(self,citta:str,codStato:str,includiPrimaPrevisione:bool,stepHours:int|None,maxHours:int)->list|None:
-		cittaEStato=citta+","+codStato
-		url=self.URL_PREVISIONE+ModuloHttpUtils.encodeUrl(cittaEStato)
-		http=ModuloHttp(url,self.__logger,False)
-		try:
-			response=http.doGet(0,False)
-		except EccezioneHttpGeneric:
-			return None
-		responseObj=json.loads(response.responseBody)
-		lista=responseObj['list']
-		maxLista=len(lista)
-		# calcolo gli indici
-		if maxHours is not None:
-			maxInd=int(maxHours/3)+1
-			if maxInd>=maxLista:
-				maxInd=maxLista-1
-		else:
-			maxInd=maxLista-1
-		if stepHours is None:
-			step=1
-		else:
-			step=int(stepHours/3)
-		inds=list(range(4,maxInd,step))
-		if includiPrimaPrevisione:
-			inds.insert(0,1)
-		# processo il json
-		output=[]
-		for ind in inds:
-			elem=lista[ind]
-			output.append(elem)
-		return output