liberty-framework 6.0.60__py3-none-any.whl → 6.0.62__py3-none-any.whl

{app → liberty}/setup/services/setup.py

@@ -1,6 +1,6 @@
 import logging
 
-from app.setup.models.liberty import Base
+from liberty.setup.models.liberty import Base
 logger = logging.getLogger(__name__)
 
 from sqlalchemy import create_engine, text
@@ -10,14 +10,14 @@ import os
 from fastapi import Request
 from fastapi.responses import JSONResponse
 
-from app.setup.services.dump import Dump
-from app.controllers.api_controller import ApiController  
-from app.config import get_ini_path
-from app.config import get_db_properties_path
-from app.setup.services.install import Install
-from app.setup.services.models import Models
-from app.utils.encrypt import Encryption
-from app.utils.jwt import JWT
+from liberty.setup.services.dump import Dump
+from liberty.controllers.api_controller import ApiController  
+from liberty.config import get_ini_path
+from liberty.config import get_db_properties_path
+from liberty.setup.services.install import Install
+from liberty.setup.services.models import Models
+from liberty.utils.encrypt import Encryption
+from liberty.utils.jwt import JWT
 
 class Setup:
     def __init__(self, apiController: ApiController, jwt: JWT):
@@ -90,8 +90,8 @@ pool_alias=default
             logging.warning(f"Configuration file created at {db_properties_path}")
 
             if os.path.exists(db_properties_path):
-                config = self.apiController.queryRest.load_db_properties(db_properties_path)
-                await self.apiController.queryRest.default_pool(config)
+                config = self.apiController.api.load_db_properties(db_properties_path)
+                await self.apiController.api.default_pool(config)
                 
                 # Return the response
                 return JSONResponse({
@@ -179,8 +179,8 @@ pool_alias=default
             logging.warning(f"Configuration file created at {db_properties_path}")
 
             if os.path.exists(db_properties_path):
-                config = self.apiController.queryRest.load_db_properties(db_properties_path)
-                await self.apiController.queryRest.default_pool(config)
+                config = self.apiController.api.load_db_properties(db_properties_path)
+                await self.apiController.api.default_pool(config)
                 
                 # Return the response
                 return JSONResponse({
@@ -268,8 +268,8 @@ pool_alias=default
             logging.warning(f"Configuration file created at {db_properties_path}")
 
             if os.path.exists(db_properties_path):
-                config = self.apiController.queryRest.load_db_properties(db_properties_path)
-                await self.apiController.queryRest.default_pool(config)
+                config = self.apiController.api.load_db_properties(db_properties_path)
+                await self.apiController.api.default_pool(config)
                 
                 # Return the response
                 return JSONResponse({
@@ -395,8 +395,8 @@ pool_alias=default
             logging.warning(f"Configuration file created at {db_properties_path}")
 
             if os.path.exists(db_properties_path):
-                config = self.apiController.queryRest.load_db_properties(db_properties_path)
-                await self.apiController.queryRest.default_pool(config)
+                config = self.apiController.api.load_db_properties(db_properties_path)
+                await self.apiController.api.default_pool(config)
                 
                 # Return the response
                 return JSONResponse({
@@ -432,7 +432,7 @@ pool_alias=default
         
             # Database configuration
             db_properties_path = get_db_properties_path()
-            config = self.apiController.queryRest.load_db_properties(db_properties_path)
+            config = self.apiController.api.load_db_properties(db_properties_path)
             # Database configuration
             ADMIN_DATABASE_URL = f"postgresql+psycopg2://{config["user"]}:{config["password"]}@{config["host"]}:{config["port"]}/{config["database"]}"
 
@@ -504,7 +504,7 @@ pool_alias=default
         
             # Database configuration
             db_properties_path = get_db_properties_path()
-            config = self.apiController.queryRest.load_db_properties(db_properties_path)
+            config = self.apiController.api.load_db_properties(db_properties_path)
             # Database configuration
             ADMIN_DATABASE_URL = f"postgresql+psycopg2://{config["user"]}:{config["password"]}@{config["host"]}:{config["port"]}/{config["database"]}"
 

{app → liberty}/utils/encrypt.py

@@ -4,7 +4,7 @@ from cryptography.hazmat.primitives.kdf.pbkdf2 import PBKDF2HMAC
 from cryptography.hazmat.primitives import hashes
 from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes
 from cryptography.hazmat.backends import default_backend
-from app.utils.jwt import JWT
+from liberty.utils.jwt import JWT
 
 class Encryption:
     def __init__(self, jwt: JWT):

{app → liberty}/utils/jwt.py

@@ -1,6 +1,6 @@
 import logging
 
-from app.config import get_encrypted_path, get_key_path, get_secrets_path
+from liberty.config import get_encrypted_path, get_key_path, get_secrets_path
 logger = logging.getLogger(__name__)
 from fastapi import  Depends, HTTPException
 from fastapi.security import HTTPBearer, HTTPAuthorizationCredentials

{liberty_framework-6.0.60.dist-info → liberty_framework-6.0.62.dist-info}/METADATA

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

liberty_framework-6.0.62.dist-info/RECORD

@@ -0,0 +1,97 @@
+liberty/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+liberty/alembic.ini,sha256=sGxERO831p17gli3eIq0FMmGhUvcdWDAtxridcpjrNc,3738
+liberty/main.py,sha256=SlO0SHXo1Dgg4GfomStXNUqy_xOIkFObrZ3dMmphaXY,9296
+liberty/alembic/README,sha256=YkE69IyN86OVtkHeD1a5chTe29HgmFxs2rBw1MxZIGo,94
+liberty/alembic/env.py,sha256=Bh53talKpzHc28WfRSZrcYm965mDdo3bUt82KVIqrpM,6079
+liberty/alembic/script.py.mako,sha256=N06nMtNSwHkgl0EBXDyMt8njp9tlOesR583gfq21nbY,1090
+liberty/alembic/versions/README,sha256=NCCgieGmMg17JYmbBdTWnHw-p9t3X6WKcxWLIyGekmc,70
+liberty/business/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+liberty/business/oracle.py,sha256=onKL9IpAH97TSLTHWlSUwUQGgH1BhZyUueYMFYHeD_w,2705
+liberty/business/postgres.py,sha256=ZcG04EtjFyRJIWx4tSE4knLR8cthN583Y6Fpixy0El4,6493
+liberty/config/__init__.py,sha256=3K_Nb8pNysyY47rqQZWnWfrQvyjhOHgBETS66tr00LM,687
+liberty/controllers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+liberty/controllers/api_controller.py,sha256=HoE-0A6_SXT4I2X8hUV3ZLV2vA9vMOCwX2q-lBSYVhk,2760
+liberty/controllers/setup_controller.py,sha256=xX7J6jI1jhvgmGpeYDuFhXIoK3EkhHYD8TRGxZt_39o,1544
+liberty/controllers/socket_controller.py,sha256=n7Z4Ld2u8VyVYZL1tJF72DO_0nihf77kqoPE44W7esA,9226
+liberty/database/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+liberty/database/base_dao.py,sha256=CseSDuzqOkgAOYEo0le7PlqKCGMUK0VcsyGSdNV6xTw,20279
+liberty/database/ora_dao.py,sha256=u4y9RukaaQ5Sjz0Hk62q9E_j1ZAO4tSVdjqCDu75Tzw,6210
+liberty/database/pg_dao.py,sha256=-LTHb0TleIryypFgPLi45l5U-tsHpyTsdFi6vePckAg,6156
+liberty/logs/__init__.py,sha256=xjkrhY9xSUg41sFGl2_tuOWANnaP4fYX8RQAn3NvAFs,514
+liberty/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+liberty/models/ai.py,sha256=x9QhDHeVly0Paa-GZhkpJBZegS0sZQMmVeJAzAtzmLI,241
+liberty/models/apidb.py,sha256=BMNM9IMtqib7NPvFw9pWpC8cQBOFKAHKHtosOU5CtIg,3824
+liberty/models/applications.py,sha256=1RwXeDDZUtR-O606bg7pyDQB-d3C6ApmaheWOUB9cBU,1679
+liberty/models/auth.py,sha256=l2gDyUUG3JYJs51VAs8AEg9fmwaQEA10Rq8iqv-vO-Q,1596
+liberty/models/base.py,sha256=BApFmQrW-jdGLvbE4pAP2IgDfDBv0esghcZzhWINoqI,2955
+liberty/models/modules.py,sha256=nsNeMUO5gTjDJl2YoZXm2Sj85gE2O5Jvh12hIdoP-38,2044
+liberty/models/pool.py,sha256=WZAzz3gbqBx7XBY_su1OoyROjE1pwSD9q4eRDtE9io4,391
+liberty/models/setup.py,sha256=BycjwHIbSAl-e_aCqjdmZH3rHFhyFiHcpnZ7BOB02js,887
+liberty/models/themes.py,sha256=XTCpc2gGF-lg3k8abo_xsneTv3eXTnfHEEYpNLmpdd8,1272
+liberty/postgres/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+liberty/postgres/dump/__init__.py,sha256=OWyQ1sBi-sCO_wol4bhHA1boUkuqs8y3yAqndiSabHk,253
+liberty/postgres/dump/airflow.dump,sha256=CBOUwXcBJZa3-GSo79pCRC4KZ3vEjyLbcCrEYy1ZN6s,135762
+liberty/postgres/dump/gitea.dump,sha256=o3naG6Bdd3FeZnqiWlEWQ_7Kxv6Xdtn5evrO_5wdxak,339131
+liberty/postgres/dump/keycloak.dump,sha256=nWZRIY7uMf7qO7m70rTNYzzl9neYphO5ackXvJF5VpQ,212083
+liberty/postgres/dump/liberty.dump,sha256=iuK2JYLiRA-bUagVha96dPJXDSJbirEuK_jHNytdpZA,212550
+liberty/postgres/dump/libnetl.dump,sha256=CKWUel9v1gZ7GS5GUIJnyEih_Y4yykKbeIXsGWIi97c,109600
+liberty/postgres/dump/libnjde.dump,sha256=7dfqxSiYcqCT56nnLDI1s87F9-zGbb9qlpkxaVrpSHA,118154
+liberty/postgres/dump/libnsx1.dump,sha256=lZ5zfVMsukd2h-Kh6DJbh1nf-6NX5noYng2ai4eBGVI,150937
+liberty/postgres/dump/nomajde.dump,sha256=9vV7g4YXu8K76DAjU_IWK40nlavrzgVelHmao3kkZpw,5756764
+liberty/postgres/dump/nomasx1.dump,sha256=zWvyrPpPWxLqLdUUK2cQq_Oc16VdUvAQoxV9Tgv7ZeY,6610530
+liberty/postgres/dump/test.dump,sha256=TKC5EOXscjoUKAzU-DfenicwMArabsk2z-JQElKhxJQ,322787
+liberty/public/__init__.py,sha256=X9OPx-1zYGkaYoqtEl8m9rj-8q74RRQkINjXdg-ZNhQ,775
+liberty/public/frontend/index.html,sha256=85HvLWfxKqRekYTUVqQlFMX-vWsvN-AfZz8tXLdUpjs,483
+liberty/public/frontend/assets/background_ly-VdfFMP8a.jpg,sha256=BKIF4GdQXYGMkRADrEFgMmIdxGH6c-5HGGa84oEMFTc,4409225
+liberty/public/frontend/assets/index-D-FD6vMP.js,sha256=HexabV9CpGrQ4IsLcgswH3lowDmvzqMgCkOxo6UMV-E,3550884
+liberty/public/frontend/assets/index-D-FD6vMP.js.map,sha256=IdBlsCDK_bUuqcbDmw2FQOOpJl7mcMdvO5KHUplEQm8,9864981
+liberty/public/frontend/assets/index.es-mB7ZF8OM-BtuhuoJS.js,sha256=WAYZHxbp1c2zPMQVRJsI3yY3nUT9hwHeqB0ozn7UHvw,158417
+liberty/public/frontend/assets/index.es-mB7ZF8OM-BtuhuoJS.js.map,sha256=T8gVd9_VrLfIMzvT8h-PEusWfR2M-e_kvLgaCOzwlp8,462185
+liberty/public/frontend/assets/logo_ly-HGj2PB94.svg,sha256=2xnOaSTVYAYU2-ARq5iO80PsKpQveFONztGCoFHl5TU,1466
+liberty/public/frontend/assets/purify.es-CKk_t3XZ-DsD8-A7d.js,sha256=p-Aqu5qpuZZ7X61OUdZKEGOS0Vn1eMGjd8lEQ4Y8ncI,22362
+liberty/public/frontend/assets/purify.es-CKk_t3XZ-DsD8-A7d.js.map,sha256=enCIu-YbEJSFgz0QOR-CGAOpn4U2ueNfRKMkY66iYag,54908
+liberty/public/offline/index.html,sha256=9ylWTfQfVHeLEBLFbRpU0xd5n-gh5DwVGjDGnOPP5z0,1491
+liberty/public/offline/assets/logo_ly.png,sha256=CpGKneK3ZhhL2VM4FXrebm0_hg6qMrUyrcLnT7jWrnY,32394
+liberty/public/setup/index.html,sha256=Tv291yszaBr8OLq-fHrCU9MDiyMzjYRDm4nKN_UH5ws,575
+liberty/public/setup/setup/assets/background_ly-VdfFMP8a.jpg,sha256=BKIF4GdQXYGMkRADrEFgMmIdxGH6c-5HGGa84oEMFTc,4409225
+liberty/public/setup/setup/assets/index-BBGAGXd2.css,sha256=hw2AYJTqhCkAQjp94mGoU184BKT8biiKC72Mgu_cgAs,382
+liberty/public/setup/setup/assets/index-knz6QXph.js,sha256=Xw_4QoQ8sA7XJEpG3NJ2oZ-ngFgKQO0aqQ-0Z0ykM1U,278200
+liberty/public/setup/setup/assets/index-knz6QXph.js.map,sha256=tQilBfxg9mkfQnfTjXwRCdpVkYTAGnRWTCcoCajoVkM,3657436
+liberty/public/setup/setup/assets/logo_ly-HGj2PB94.svg,sha256=2xnOaSTVYAYU2-ARq5iO80PsKpQveFONztGCoFHl5TU,1466
+liberty/routes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+liberty/routes/api_routes.py,sha256=uZjr_o2NXuKE7Bpyl_lJtFX7V3t0k1zNvlaeiNpSB-o,25005
+liberty/routes/react_routes.py,sha256=XyF0wJn-VSRyIWRFKjmDYXOBCfzbcopTvsJYCkNMOhI,1422
+liberty/routes/setup_routes.py,sha256=WnGPUPNY8ESx1bW0kpmUrJdK6v_biaBAHMXFfqtlysk,8407
+liberty/routes/socket_routes.py,sha256=CmG3PcQiQ_YLG2qmNqW2zPiO_7pz0LbZaSNpwug0ipE,564
+liberty/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+liberty/services/api_services.py,sha256=ZYVrIDFfpDBJ8cKWpWUXbL-DTtQdko4XmuLbb0k-pPo,27485
+liberty/services/db_pool.py,sha256=8fQ_73UCdcegNqhDyXqwUOyhkC-ETwqrM0J2WTv_B_o,2055
+liberty/services/rest_services.py,sha256=BsUI-1l-bdxG0CrguU_8sAblLh4i5NUMonJcqMHzkMs,12514
+liberty/setup/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+liberty/setup/data/__init__.py,sha256=O_sR1CffdiknRqZEek6A4RehrzaRU4PsvrRaxISTqgo,312
+liberty/setup/data/liberty.json,sha256=IOSM9drYx9rN6WSQi_8J_rRJeWIM4CrBltr57ZkiGCU,1813661
+liberty/setup/data/libnetl.json,sha256=-RwcmMimteEyaq5swc8TjppJWZ3hbg9tFr0QZSWIX8s,56812
+liberty/setup/data/libnjde.json,sha256=kRTkB2U-PjBOxIntsoS2ShBqUE-z0RLf5S66VBtI7is,551310
+liberty/setup/data/libnsx1.json,sha256=I5Oy9XG8iCUmHUod3RQr44VOAuAnEO9gmwjbc_z7zOg,1222122
+liberty/setup/data/nomasx1.json,sha256=BKlfaBj-aijbQq13Lcv2NGwGuy5ypF3QoxwwBaydooM,352058
+liberty/setup/models/__init__.py,sha256=cJWsJtbU3-aFnJZ45hcEMDEThfwOyrsWI62sX2vOUFU,251
+liberty/setup/models/liberty.py,sha256=GN7s65YoOmseJu8CrUdVfUYJ08psW4GdEZV-xP3yDfU,49880
+liberty/setup/models/nomasx1.py,sha256=8S75KADMeu0QAW4z9TGQqNPzbbo8IDe5paINYjg7urY,62600
+liberty/setup/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+liberty/setup/services/alembic.py,sha256=1BNjpxEier6tRjO19X0RZkVyEWmXaUWzPLbTZEadwRw,3168
+liberty/setup/services/dump.py,sha256=GU_UfNiHS6jKSwZMR_7fj95q9bgEEVUQcKYiyYFxxIw,7560
+liberty/setup/services/install.py,sha256=cnJMJJu-odc0s_7DVWQSHxJrUVkYvEnkFDo-1X5SrdU,8795
+liberty/setup/services/models.py,sha256=9TIqa3aaxXMkRhI3fjeKWrtg3l48AJyVC2up6AHLVDE,10045
+liberty/setup/services/setup.py,sha256=d1O6fCR1YJFfjPgxOLprNW9_DXMVLhjhRG6pAVwInoo,23828
+liberty/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+liberty/utils/common.py,sha256=UrbbEeqwJ9WXxgTixlOI6wQl06OJBNtEVabiTN77EVc,355
+liberty/utils/encrypt.py,sha256=zCaI7AAFVWQNtJs7RlRJghcz5S6PBB7TkDYxKa3vfqc,2823
+liberty/utils/jwt.py,sha256=12syGng8dpOisIQIK4ymcrfzxOIZc8APl-qsF-Hu-6U,4588
+liberty/utils/logs.py,sha256=OEqgQ_TS9rhWNlsesK0S-2pZCsAKip7sU5quLOMfVC8,13842
+liberty/utils/test.py,sha256=SUnmWK-4MI9eeJ2DDdd83aMDd82mlFsjcY9aPXNe1nU,46520
+liberty_framework-6.0.62.dist-info/LICENSE,sha256=ILBn-G3jdarm2w8oOrLmXeJNU3czuJvVhDLBASWdhM8,34522
+liberty_framework-6.0.62.dist-info/METADATA,sha256=fm6lSODNXOSfIwNvJ0BRkBFb_rADt4G2O-vf4u3DjFc,8243
+liberty_framework-6.0.62.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+liberty_framework-6.0.62.dist-info/entry_points.txt,sha256=FneEL5EExrPgFmB6lfFnWetDE_GH9_0jMCqACwti7RA,52
+liberty_framework-6.0.62.dist-info/top_level.txt,sha256=yLVi7QPQ0gb9dLWV2sULEDuUqws-0wVbf3sLKo0G-JQ,8
+liberty_framework-6.0.62.dist-info/RECORD,,

liberty_framework-6.0.62.dist-info/entry_points.txt

@@ -0,0 +1,2 @@
+[console_scripts]
+liberty-start = liberty.main:main

liberty_framework-6.0.62.dist-info/top_level.txt

@@ -0,0 +1 @@
+liberty

app/config/files/liberty.ini

@@ -1,32 +0,0 @@
-[repository]
-databases = liberty, libnsx1, libnjde, libnetl
-
-[liberty]
-model = true
-data = true
-tables = 
-
-[libnsx1]
-model = false
-data = true
-tables = 
-
-[libnjde]
-model = false
-data = true
-tables = 
-
-[libnetl]
-model = false
-data = true
-tables = 
-
-[nomasx1]
-model = true
-data = true
-tables = settings_db_features, settings_db_options, settings_db_versions, settings_jde_prereq, settings_jde_rclst, settings_jde_restrictions, settings_jde_sy, settings_lic_components, settings_lic_metrics, settings_lic_pricing
-
-[nomajde]
-model = false
-data = false
-tables =