modulitiz-micro 2.45.1__py311-none-any.whl → 2.46.0__py311-none-any.whl

modulitiz_micro/database/sqlite/AbstractBasicSQLite.py

@@ -1,114 +1,114 @@
-from abc import abstractmethod
-
-from modulitiz_nano.ModuloStringhe import ModuloStringhe
-from modulitiz_micro.database.sqlite.ModuloSQLite import AbstractSqlite
-
-
-class AbstractBasicSqlite(AbstractSqlite):
-	
-	def __init__(self,*args,**kwargs):
-		super().__init__(*args,**kwargs)
-		if not self.isDbNew:
-			return
-		sql_str=ModuloStringhe.normalizzaEol(self.schemaBasicTables())
-		with self.initCursor() as cursoreDb:
-			with self.lock:
-				cursoreDb.executescript(sql_str)
-			sql_insertBasicTables=self.insertBasicTables()
-			if not ModuloStringhe.isEmpty(sql_insertBasicTables):
-				sql_insertBasicTables=ModuloStringhe.normalizzaEol(sql_insertBasicTables)
-				with self.lock:
-					cursoreDb.executescript(sql_insertBasicTables)
-		self.commit()
-	
-	@abstractmethod
-	def insertBasicTables(self):
-		"""
-		Inserire le istruzioni sql che vanno eseguite alla fine di tutto
-		"""
-	
-	def schemaBasicTables(self):
-		return """
-
-CREATE TABLE tb_params(
-	id						INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
-	type					TEXT NOT NULL,
-	key						TEXT NULL,
-	desc					TEXT NOT NULL,
-	enabled					INTEGER NOT NULL,
-	lang_code				TEXT NULL,
-	data_insert				TIMESTAMP NOT NULL
-);
-CREATE UNIQUE INDEX PARAMS__UK1 ON tb_params(
-	type,
-	IFNULL(key, 0),
-	IFNULL(lang_code, 0)
-);
-
-"""
-	
-	
-	#############################################################################################################################
-	#############################################################################################################################
-	#############################################################################################################################
-	def selectParamDescByEntries(self,paramType,paramKey)->str|None:
-		with self.selectParamByEntries(paramType, paramKey, None, True) as cursoreDb:
-			results=cursoreDb.fetchall()
-		if len(results)==0:
-			return None
-		return results[0]['desc']
-	
-	def selectParamByEntries(self,paramType,paramKey,langCode,enabled):
-		addParamKey=ModuloStringhe.isEmpty(paramKey) is False
-		addLangCode=ModuloStringhe.isEmpty(langCode) is False
-		addEnabled=ModuloStringhe.isEmpty(enabled) is False
-		
-		sql="""
-SELECT *
-FROM tb_params
-WHERE type=:paramType
-"""+("AND key=:paramKey" if addParamKey is True else "")+"""
-"""+("AND langCode=:langCode" if addLangCode is True else "")+"""
-"""+("AND enabled=:enabled" if addEnabled is True else "")+"""
-;
-"""
-		params={'paramType':paramType}
-		if addParamKey is True:
-			params['paramKey']=paramKey
-		if addLangCode is True:
-			params['langCode']=langCode
-		if addEnabled is True:
-			params['enabled']=enabled
-		cursoreDb=self.initCursor()
-		with self.lock:
-			cursoreDb.execute(sql,params)
-		return cursoreDb
-	
-	
-	def updateParamDesc(self,paramType,paramKey,newDesc):
-		addParamKey=ModuloStringhe.isEmpty(paramKey) is False
-		addNewDesc=ModuloStringhe.isEmpty(newDesc) is False
-		
-		sql_set=[]
-		if addNewDesc is True:
-			sql_set.append("desc=:newDesc")
-		sql_set=", ".join(sql_set)
-		
-		sql="""
-UPDATE tb_params
-SET """+sql_set+"""
-WHERE type=:paramType
-"""+("AND key=:paramKey" if addParamKey is True else "")+"""
-;
-"""
-		params={}
-		if addNewDesc is True:
-			params['newDesc']=newDesc
-		params['paramType']=paramType
-		if addParamKey is True:
-			params['paramKey']=paramKey
-		cursoreDb=self.initCursor()
-		with self.lock:
-			cursoreDb.execute(sql,params)
-		return cursoreDb
-	
+from abc import abstractmethod
+
+from modulitiz_nano.ModuloStringhe import ModuloStringhe
+from modulitiz_micro.database.sqlite.ModuloSQLite import AbstractSqlite
+
+
+class AbstractBasicSqlite(AbstractSqlite):
+	
+	def __init__(self,*args,**kwargs):
+		super().__init__(*args,**kwargs)
+		if not self.isDbNew:
+			return
+		sql_str=ModuloStringhe.normalizzaEol(self.schemaBasicTables())
+		with self.initCursor() as cursoreDb:
+			with self.lock:
+				cursoreDb.executescript(sql_str)
+			sql_insertBasicTables=self.insertBasicTables()
+			if not ModuloStringhe.isEmpty(sql_insertBasicTables):
+				sql_insertBasicTables=ModuloStringhe.normalizzaEol(sql_insertBasicTables)
+				with self.lock:
+					cursoreDb.executescript(sql_insertBasicTables)
+		self.commit()
+	
+	@abstractmethod
+	def insertBasicTables(self):
+		"""
+		Inserire le istruzioni sql che vanno eseguite alla fine di tutto
+		"""
+	
+	def schemaBasicTables(self):
+		return """
+
+CREATE TABLE tb_params(
+	id						INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
+	type					TEXT NOT NULL,
+	key						TEXT NULL,
+	desc					TEXT NOT NULL,
+	enabled					INTEGER NOT NULL,
+	lang_code				TEXT NULL,
+	data_insert				TIMESTAMP NOT NULL
+);
+CREATE UNIQUE INDEX PARAMS__UK1 ON tb_params(
+	type,
+	IFNULL(key, 0),
+	IFNULL(lang_code, 0)
+);
+
+"""
+	
+	
+	#############################################################################################################################
+	#############################################################################################################################
+	#############################################################################################################################
+	def selectParamDescByEntries(self,paramType,paramKey)->str|None:
+		with self.selectParamByEntries(paramType, paramKey, None, True) as cursoreDb:
+			results=cursoreDb.fetchall()
+		if len(results)==0:
+			return None
+		return results[0]['desc']
+	
+	def selectParamByEntries(self,paramType,paramKey,langCode,enabled):
+		addParamKey=ModuloStringhe.isEmpty(paramKey) is False
+		addLangCode=ModuloStringhe.isEmpty(langCode) is False
+		addEnabled=ModuloStringhe.isEmpty(enabled) is False
+		
+		sql="""
+SELECT *
+FROM tb_params
+WHERE type=:paramType
+"""+("AND key=:paramKey" if addParamKey is True else "")+"""
+"""+("AND langCode=:langCode" if addLangCode is True else "")+"""
+"""+("AND enabled=:enabled" if addEnabled is True else "")+"""
+;
+"""
+		params={'paramType':paramType}
+		if addParamKey is True:
+			params['paramKey']=paramKey
+		if addLangCode is True:
+			params['langCode']=langCode
+		if addEnabled is True:
+			params['enabled']=enabled
+		cursoreDb=self.initCursor()
+		with self.lock:
+			cursoreDb.execute(sql,params)
+		return cursoreDb
+	
+	
+	def updateParamDesc(self,paramType,paramKey,newDesc):
+		addParamKey=ModuloStringhe.isEmpty(paramKey) is False
+		addNewDesc=ModuloStringhe.isEmpty(newDesc) is False
+		
+		sql_set=[]
+		if addNewDesc is True:
+			sql_set.append("desc=:newDesc")
+		sql_set=", ".join(sql_set)
+		
+		sql="""
+UPDATE tb_params
+SET """+sql_set+"""
+WHERE type=:paramType
+"""+("AND key=:paramKey" if addParamKey is True else "")+"""
+;
+"""
+		params={}
+		if addNewDesc is True:
+			params['newDesc']=newDesc
+		params['paramType']=paramType
+		if addParamKey is True:
+			params['paramKey']=paramKey
+		cursoreDb=self.initCursor()
+		with self.lock:
+			cursoreDb.execute(sql,params)
+		return cursoreDb
+	

modulitiz_micro/database/sqlite/ModuloSQLite.py

@@ -1,82 +1,82 @@
-"""
-esempio utilizzo per lista
-
-def __query_NOME_TABELLA(self,lista_status,is_count):
-	paramsStatus=ModuloSQLite.add_param_list(lista_status, "status")
-	
-	sql='''
-SELECT '''+("COUNT(*)" if is_count is True else "*")+'''
-FROM NOME_TABELLA
-WHERE 1=1
-AND status IN (:'''+",:".join(paramsStatus.keys())+''')
-;
-'''
-	cursoreDb.execute(sql,paramsStatus)
-"""
-import sqlite3
-from abc import abstractmethod
-
-from modulitiz_nano.ModuloStringhe import ModuloStringhe
-from modulitiz_micro.database.AbstractSql import AbstractSql
-from modulitiz_nano.files.ModuloFiles import ModuloFiles
-
-
-class AbstractSqlite(AbstractSql):
-	"""
-	select
-	count
-	insert
-	update
-	delete
-	"""
-	
-	DATE_TIME_NOW="datetime('now','localtime')"
-	DATE_TIME_NOW_MILLIS="strftime('%Y-%m-%d %H:%M:%f', 'now')"
-	
-	TIMEOUT_CONNECTION=10
-	
-	@abstractmethod
-	def schema(self):
-		"""
-		Insert here sql instructions containing table definitions (DDL)
-		"""
-	
-	def __init__(self,nomefile_db:str,show_sql:bool=False):
-		super().__init__()
-		self.isDbNew=ModuloFiles.getFileSize(nomefile_db)<=0
-		#apro la connessione col db
-		connDb=sqlite3.connect(nomefile_db, timeout=self.TIMEOUT_CONNECTION, detect_types=sqlite3.PARSE_DECLTYPES, check_same_thread=False)
-		#modifica row factory per usare Row
-		connDb.row_factory=sqlite3.Row
-		self.connDb=connDb
-		# creo il cursore, deve essere fatto dopo il row factory
-		with self.initCursor() as cursoreDb:
-			# setup iniziale
-			with self.lock:
-				# non puoi cancellare un record se e' referenziato da un'altra tabella
-				cursoreDb.executescript('PRAGMA foreign_keys=ON;')
-			self.commit()
-			# mostra i comandi sql eseguiti
-			if show_sql is True:
-				self.connDb.set_trace_callback(print)
-			# se il db non esisteva creo le tabelle
-			if self.isDbNew:
-				sql_str=ModuloStringhe.normalizzaEol(self.schema())
-				with self.lock:
-					cursoreDb.executescript(sql_str)
-				self.commit()
-	
-	@staticmethod
-	def getLastIdInserted(cursoreDb):
-		return cursoreDb.lastrowid
-
-def paginazione(first_result:int,num_results:int)->str:
-	sql=("LIMIT "+str(num_results) if num_results is not None else "")
-	sql+=(" OFFSET "+str(first_result) if first_result is not None else "")
-	return sql
-
-def add_param_list(lista,prefix):
-	params={}
-	for index,elem in enumerate(lista):
-		params[prefix+str(index)]=elem
-	return params
+"""
+esempio utilizzo per lista
+
+def __query_NOME_TABELLA(self,lista_status,is_count):
+	paramsStatus=ModuloSQLite.add_param_list(lista_status, "status")
+	
+	sql='''
+SELECT '''+("COUNT(*)" if is_count is True else "*")+'''
+FROM NOME_TABELLA
+WHERE 1=1
+AND status IN (:'''+",:".join(paramsStatus.keys())+''')
+;
+'''
+	cursoreDb.execute(sql,paramsStatus)
+"""
+import sqlite3
+from abc import abstractmethod
+
+from modulitiz_nano.ModuloStringhe import ModuloStringhe
+from modulitiz_micro.database.AbstractSql import AbstractSql
+from modulitiz_nano.files.ModuloFiles import ModuloFiles
+
+
+class AbstractSqlite(AbstractSql):
+	"""
+	select
+	count
+	insert
+	update
+	delete
+	"""
+	
+	DATE_TIME_NOW="datetime('now','localtime')"
+	DATE_TIME_NOW_MILLIS="strftime('%Y-%m-%d %H:%M:%f', 'now')"
+	
+	TIMEOUT_CONNECTION=10
+	
+	@abstractmethod
+	def schema(self):
+		"""
+		Insert here sql instructions containing table definitions (DDL)
+		"""
+	
+	def __init__(self,nomefile_db:str,show_sql:bool=False):
+		super().__init__()
+		self.isDbNew=ModuloFiles.getFileSize(nomefile_db)<=0
+		#apro la connessione col db
+		connDb=sqlite3.connect(nomefile_db, timeout=self.TIMEOUT_CONNECTION, detect_types=sqlite3.PARSE_DECLTYPES, check_same_thread=False)
+		#modifica row factory per usare Row
+		connDb.row_factory=sqlite3.Row
+		self.connDb=connDb
+		# creo il cursore, deve essere fatto dopo il row factory
+		with self.initCursor() as cursoreDb:
+			# setup iniziale
+			with self.lock:
+				# non puoi cancellare un record se e' referenziato da un'altra tabella
+				cursoreDb.executescript('PRAGMA foreign_keys=ON;')
+			self.commit()
+			# mostra i comandi sql eseguiti
+			if show_sql is True:
+				self.connDb.set_trace_callback(print)
+			# se il db non esisteva creo le tabelle
+			if self.isDbNew:
+				sql_str=ModuloStringhe.normalizzaEol(self.schema())
+				with self.lock:
+					cursoreDb.executescript(sql_str)
+				self.commit()
+	
+	@staticmethod
+	def getLastIdInserted(cursoreDb):
+		return cursoreDb.lastrowid
+
+def paginazione(first_result:int,num_results:int)->str:
+	sql=("LIMIT "+str(num_results) if num_results is not None else "")
+	sql+=(" OFFSET "+str(first_result) if first_result is not None else "")
+	return sql
+
+def add_param_list(lista,prefix):
+	params={}
+	for index,elem in enumerate(lista):
+		params[prefix+str(index)]=elem
+	return params

modulitiz_micro/eccezioni/EccezioneCtrlC.py

@@ -1,7 +1,7 @@
-from modulitiz_nano.eccezioni.EccezioneBase import EccezioneBase
-
-
-class EccezioneCtrlC(EccezioneBase):
-	
-	def __init__(self,*args,**kwargs):
-		super().__init__(*args,**kwargs)
+from modulitiz_nano.eccezioni.EccezioneBase import EccezioneBase
+
+
+class EccezioneCtrlC(EccezioneBase):
+	
+	def __init__(self,*args,**kwargs):
+		super().__init__(*args,**kwargs)

modulitiz_micro/eccezioni/EccezioneScheduler.py

@@ -1,7 +1,7 @@
-from modulitiz_nano.eccezioni.EccezioneBase import EccezioneBase
-
-
-class EccezioneScheduler(EccezioneBase):
-	
-	def __init__(self,*args,**kwargs):
-		super().__init__(*args,**kwargs)
+from modulitiz_nano.eccezioni.EccezioneBase import EccezioneBase
+
+
+class EccezioneScheduler(EccezioneBase):
+	
+	def __init__(self,*args,**kwargs):
+		super().__init__(*args,**kwargs)

modulitiz_micro/eccezioni/http/EccezioneHttp.py

@@ -1,8 +1,8 @@
-from modulitiz_nano.eccezioni.EccezioneBase import EccezioneBase
-
-
-class EccezioneHttp(EccezioneBase):
-	
-	def __init__(self,httpCode:int|None,*args,**kwargs):
-		super().__init__(*args,**kwargs)
-		self.httpCode=httpCode
+from modulitiz_nano.eccezioni.EccezioneBase import EccezioneBase
+
+
+class EccezioneHttp(EccezioneBase):
+	
+	def __init__(self,httpCode:int|None,*args,**kwargs):
+		super().__init__(*args,**kwargs)
+		self.httpCode=httpCode

modulitiz_micro/eccezioni/http/EccezioneHttp404.py

@@ -1,7 +1,7 @@
-from modulitiz_micro.eccezioni.http.EccezioneHttp import EccezioneHttp
-
-
-class EccezioneHttp404(EccezioneHttp):
-	
-	def __init__(self):
-		super().__init__(404)
+from modulitiz_micro.eccezioni.http.EccezioneHttp import EccezioneHttp
+
+
+class EccezioneHttp404(EccezioneHttp):
+	
+	def __init__(self):
+		super().__init__(404)

modulitiz_micro/eccezioni/http/EccezioneHttpGeneric.py

@@ -1,7 +1,7 @@
-from modulitiz_micro.eccezioni.http.EccezioneHttp import EccezioneHttp
-
-
-class EccezioneHttpGeneric(EccezioneHttp):
-	
-	def __init__(self):
-		super().__init__(None)
+from modulitiz_micro.eccezioni.http.EccezioneHttp import EccezioneHttp
+
+
+class EccezioneHttpGeneric(EccezioneHttp):
+	
+	def __init__(self):
+		super().__init__(None)

modulitiz_micro/files/cache/DatabaseCache.py

@@ -1,91 +1,91 @@
-from modulitiz_nano.ModuloStringhe import ModuloStringhe
-from modulitiz_micro.database.sqlite.ModuloSQLite import AbstractSqlite
-
-
-class DatabaseCache(AbstractSqlite):
-	
-	# costruttore
-	def __init__(self,*args,**kwargs):
-		super().__init__(*args,**kwargs)
-	
-	# metodi
-	def schema(self):
-		sql="""
-CREATE TABLE tb_cache(
-	id						INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
-	type					TEXT NOT NULL,
-	key						TEXT NULL,
-	valore					TEXT NOT NULL,
-	data_insert				TIMESTAMP NOT NULL
-);
-CREATE UNIQUE INDEX IX_tb_cache__type_key ON tb_cache(type,key);
-
-"""
-
-		return sql
-	
-	def insertBasicTables(self):
-		return
-	
-	
-	#############################################################################################################################
-	def select_cache_valore_by_entries(self,tipo,chiave):
-		results=self.select_cache_by_entries(tipo, chiave)
-		if results is None:
-			return None
-		return results[0]['valore']
-	
-	def select_cache_by_entries(self,tipo,chiave):
-		with self.__query_cache_by_entries(tipo, chiave,False) as cursoreDb:
-			results=cursoreDb.fetchall()
-		if len(results)==0:
-			return None
-		return results
-	
-	def count_cache_by_entries(self,tipo,chiave)->int:
-		cursoreDb=self.__query_cache_by_entries(tipo, chiave,True)
-		return self.count(cursoreDb)
-	
-	def __query_cache_by_entries(self,tipo,chiave,isCount):
-		add_chiave=ModuloStringhe.isEmpty(chiave) is False
-		sql="SELECT "+("COUNT(*) AS conta" if isCount is True else "*")+"""
-FROM tb_cache
-WHERE type=:tipo
-"""+("AND key=:chiave" if add_chiave is True else "")+"""
-;
-"""
-		params={'tipo':tipo}
-		if add_chiave is True:
-			params['chiave']=chiave
-		
-		cursoreDb=self.initCursor()
-		cursoreDb.execute(sql,params)
-		return cursoreDb
-	
-	def insert_cache(self,tipo,chiave,valore):
-		sql="""
-INSERT INTO tb_cache(
-type,key,valore,data_insert
-) VALUES (
-:tipo,:chiave,:valore,"""+self.DATE_TIME_NOW+"""
-);
-"""
-		cursoreDb=self.initCursor()
-		cursoreDb.execute(sql,{
-			'tipo':tipo,'chiave':chiave,'valore':valore
-		})
-		return cursoreDb
-	
-	def update_cache_valore(self,tipo,chiave,valore):
-		sql="""
-UPDATE tb_cache
-SET valore=:valore,data_insert="""+self.DATE_TIME_NOW+"""
-WHERE type=:tipo AND key=:chiave
-;
-"""
-		cursoreDb=self.initCursor()
-		cursoreDb.execute(sql,{
-			'valore':valore,'tipo':tipo,'chiave':chiave
-		})
-		return cursoreDb
-	
+from modulitiz_nano.ModuloStringhe import ModuloStringhe
+from modulitiz_micro.database.sqlite.ModuloSQLite import AbstractSqlite
+
+
+class DatabaseCache(AbstractSqlite):
+	
+	# costruttore
+	def __init__(self,*args,**kwargs):
+		super().__init__(*args,**kwargs)
+	
+	# metodi
+	def schema(self):
+		sql="""
+CREATE TABLE tb_cache(
+	id						INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
+	type					TEXT NOT NULL,
+	key						TEXT NULL,
+	valore					TEXT NOT NULL,
+	data_insert				TIMESTAMP NOT NULL
+);
+CREATE UNIQUE INDEX IX_tb_cache__type_key ON tb_cache(type,key);
+
+"""
+
+		return sql
+	
+	def insertBasicTables(self):
+		return
+	
+	
+	#############################################################################################################################
+	def select_cache_valore_by_entries(self,tipo,chiave):
+		results=self.select_cache_by_entries(tipo, chiave)
+		if results is None:
+			return None
+		return results[0]['valore']
+	
+	def select_cache_by_entries(self,tipo,chiave):
+		with self.__query_cache_by_entries(tipo, chiave,False) as cursoreDb:
+			results=cursoreDb.fetchall()
+		if len(results)==0:
+			return None
+		return results
+	
+	def count_cache_by_entries(self,tipo,chiave)->int:
+		cursoreDb=self.__query_cache_by_entries(tipo, chiave,True)
+		return self.count(cursoreDb)
+	
+	def __query_cache_by_entries(self,tipo,chiave,isCount):
+		add_chiave=ModuloStringhe.isEmpty(chiave) is False
+		sql="SELECT "+("COUNT(*) AS conta" if isCount is True else "*")+"""
+FROM tb_cache
+WHERE type=:tipo
+"""+("AND key=:chiave" if add_chiave is True else "")+"""
+;
+"""
+		params={'tipo':tipo}
+		if add_chiave is True:
+			params['chiave']=chiave
+		
+		cursoreDb=self.initCursor()
+		cursoreDb.execute(sql,params)
+		return cursoreDb
+	
+	def insert_cache(self,tipo,chiave,valore):
+		sql="""
+INSERT INTO tb_cache(
+type,key,valore,data_insert
+) VALUES (
+:tipo,:chiave,:valore,"""+self.DATE_TIME_NOW+"""
+);
+"""
+		cursoreDb=self.initCursor()
+		cursoreDb.execute(sql,{
+			'tipo':tipo,'chiave':chiave,'valore':valore
+		})
+		return cursoreDb
+	
+	def update_cache_valore(self,tipo,chiave,valore):
+		sql="""
+UPDATE tb_cache
+SET valore=:valore,data_insert="""+self.DATE_TIME_NOW+"""
+WHERE type=:tipo AND key=:chiave
+;
+"""
+		cursoreDb=self.initCursor()
+		cursoreDb.execute(sql,{
+			'valore':valore,'tipo':tipo,'chiave':chiave
+		})
+		return cursoreDb
+