liberty-framework 6.0.66__tar.gz → 6.0.68__tar.gz

{liberty_framework-6.0.66/liberty_framework.egg-info → liberty_framework-6.0.68}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: liberty-framework
-Version: 6.0.66
+Version: 6.0.68
 Summary: Liberty Framework
 Author: Franck Blettner
 Author-email: franck.blettner@nomana-it.fr

{liberty_framework-6.0.66 → liberty_framework-6.0.68}/liberty/framework/alembic/env.py

@@ -9,7 +9,7 @@ from sqlalchemy import pool
 
 from alembic import context
 from liberty.framework.config import get_db_properties_path
-from liberty.framework.setup.models import liberty, nomasx1
+from liberty.framework.setup.models import liberty, nomasx1, nomaarf
 from liberty.framework.utils.encrypt import Encryption
 from liberty.framework.utils.jwt import JWT
 
@@ -46,8 +46,9 @@ target_metadata = {
     "liberty": liberty.Base.metadata,
     "libnsx1": liberty.Base.metadata,
     "libnjde": liberty.Base.metadata,
-    "libnetl": liberty.Base.metadata,
+    "libnarf": liberty.Base.metadata,
     "nomasx1": nomasx1.Base.metadata,
+    "nomaarf": nomaarf.Base.metadata,
 }
 
 # other values from the config, defined by the needs of env.py,
@@ -69,8 +70,9 @@ database_url ={
     "liberty": f"postgresql+psycopg2://liberty:{encryption.decrypt_text(db_config.get('password'))}@{db_config.get('host')}:{db_config.get('port')}/liberty",
     "libnsx1": f"postgresql+psycopg2://libnsx1:{encryption.decrypt_text(db_config.get('password'))}@{db_config.get('host')}:{db_config.get('port')}/libnsx1",
     "libnjde": f"postgresql+psycopg2://libnjde:{encryption.decrypt_text(db_config.get('password'))}@{db_config.get('host')}:{db_config.get('port')}/libnjde",
-    "libnetl": f"postgresql+psycopg2://libnetl:{encryption.decrypt_text(db_config.get('password'))}@{db_config.get('host')}:{db_config.get('port')}/libnetl",
+    "libnarf": f"postgresql+psycopg2://libnarf:{encryption.decrypt_text(db_config.get('password'))}@{db_config.get('host')}:{db_config.get('port')}/libnarf",
     "nomasx1": f"postgresql+psycopg2://nomasx1:{encryption.decrypt_text(db_config.get('password'))}@{db_config.get('host')}:{db_config.get('port')}/nomasx1",
+    "nomaarf": f"postgresql+psycopg2://nomaarf:{encryption.decrypt_text(db_config.get('password'))}@{db_config.get('host')}:{db_config.get('port')}/nomaarf",
 }
 
 

{liberty_framework-6.0.66 → liberty_framework-6.0.68}/liberty/framework/alembic.ini

@@ -63,7 +63,7 @@ version_path_separator = os
 # are written from script.py.mako
 # output_encoding = utf-8
 
-databases = liberty, libnsx1, libnjde, libnetl, nomasx1
+databases = liberty, libnsx1, libnjde, libnarf, nomasx1, nomaarf
 
 [post_write_hooks]
 # post_write_hooks defines scripts or Python functions that are run

{liberty_framework-6.0.66 → liberty_framework-6.0.68}/liberty/framework/config/files/liberty.ini

@@ -1,5 +1,5 @@
 [repository]
-databases = liberty, libnsx1, libnjde, libnetl
+databases = liberty, libnsx1, libnjde, libnarf, nomasx1, nomaarf
 
 [liberty]
 model = true
@@ -16,7 +16,7 @@ model = false
 data = true
 tables = 
 
-[libnetl]
+[libnarf]
 model = false
 data = true
 tables = 
@@ -30,3 +30,8 @@ tables = settings_db_features, settings_db_options, settings_db_versions, settin
 model = false
 data = false
 tables = 
+
+[nomaarf]
+model = true
+data = false
+tables = 

{liberty_framework-6.0.66 → liberty_framework-6.0.68}/liberty/framework/database/base_dao.py

@@ -4,7 +4,7 @@ logger = logging.getLogger(__name__)
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy.orm import sessionmaker
 from datetime import datetime, date
-from typing import Any, Dict, List, Optional
+from typing import Any, Dict, List, Optional, Union
 from sqlalchemy import text
 import re
 from abc import abstractmethod
@@ -132,9 +132,9 @@ class BaseDAO:
             self.engine = None  # Reset the engine to None
             self.async_session = None  # Reset the sessionmaker to None
                    
-    def replace_variables_placeholders(self, query: str, variables: List[Dict[str, str]]) -> str:
+    def replace_variables_placeholders(self, query: str, variables: Dict[str, Union[str, int, float, None]]) -> str:
         for name, value in variables.items():
-            if name != "\r":
+            if name != "\r" : 
                 if isinstance(value, (int, float)) or value is not None:
                     # Handle dollar signs and escape single quotes in strings
                     if isinstance(value, str):
@@ -165,12 +165,16 @@ class BaseDAO:
 
                 if "q" in context:
                     # Create the where clause of the query with the context 
-                    where = json.loads(context["q"])
-                    query = await self.construct_query_where(query, where)
+                    q = json.loads(context["q"])
+                    query = await self.construct_query_where(query, q)
 
                 if "where" in context:
                     query = self.replace_variables_placeholders(query, context["where"])
 
+                if "params" in context:
+                    params = json.loads(context["params"])
+                    query = self.replace_variables_placeholders(query, params)
+
                 # Add ORDER BY Clause 
                 if target_query[0][1] is not None:
                     query += '\nORDER BY ' + target_query[0][1]
@@ -269,22 +273,18 @@ class BaseDAO:
             raise RuntimeError(f"Query execution failed: {str(err)}")
 
 
-    async def get(self, query: str, context, params: Optional[Dict[str, Any]] = None) -> List[Dict[str, Any]]:
+    async def get(self, query: str, context) -> List[Dict[str, Any]]:
         """
         Executes a query and returns the result along with metadata.
 
         Args:
             query (str): The SQL query to execute.
-            params (Optional[Dict[str, Any]]): Query parameters.
-
         Returns:
             Dict[str, Any]: A dictionary containing rows, column metadata, and row count.
         """
         try:
             # Use SQLAlchemy's `text` to prepare the query
             statement = await self.build_query(query, context, False)
-            if params:
-                self.replace_variables_placeholders(query, params)
 
             # Open a session
             async with self.get_session() as session:
@@ -386,7 +386,11 @@ class BaseDAO:
                     async with session.begin():  # Start a transaction
                         result = await session.execute(text(statement))
                         # Commit is implicit in session.begin() if no exception is raised
-                        return result.rowcount
+                        if "returning" in statement.lower():
+                            rows = [dict(row) for row in result.mappings().all()] 
+                        else:
+                            rows = [] 
+                        return {"count": result.rowcount, "rows": rows}
                 except Exception as e:
                     logger.exception(f"Error executing statement: {e}")
                     import traceback