liberty-framework 6.0.65__py3-none-any.whl → 6.0.67__py3-none-any.whl

liberty/{alembic → framework/alembic}/env.py

@@ -8,10 +8,10 @@ from sqlalchemy import create_engine, engine_from_config
 from sqlalchemy import pool
 
 from alembic import context
-from liberty.config import get_db_properties_path
-from liberty.setup.models import liberty, nomasx1
-from liberty.utils.encrypt import Encryption
-from liberty.utils.jwt import JWT
+from liberty.framework.config import get_db_properties_path
+from liberty.framework.setup.models import liberty, nomasx1
+from liberty.framework.utils.encrypt import Encryption
+from liberty.framework.utils.jwt import JWT
 
 USE_TWOPHASE = False
 

liberty/{controllers → framework/controllers}/api_controller.py

@@ -1,8 +1,8 @@
 from fastapi import HTTPException, Request
-from liberty.utils.encrypt import Encryption
-from liberty.utils.jwt import JWT
-from liberty.services.api_services import API
-from liberty.services.rest_services import Rest
+from liberty.framework.utils.encrypt import Encryption
+from liberty.framework.utils.jwt import JWT
+from liberty.framework.services.api_services import API
+from liberty.framework.services.rest_services import Rest
 
 class ApiController:
     def __init__(self, jwt: JWT, api: API = None, rest: Rest = None):

liberty/{controllers → framework/controllers}/setup_controller.py

@@ -2,10 +2,10 @@ import logging
 logger = logging.getLogger(__name__)
 
 from fastapi import Request
-from liberty.controllers.api_controller import ApiController
-from liberty.utils.jwt import JWT
-from liberty.setup.services.setup import Setup
-from liberty.setup.services.alembic import Alembic
+from liberty.framework.controllers.api_controller import ApiController
+from liberty.framework.utils.jwt import JWT
+from liberty.framework.setup.services.setup import Setup
+from liberty.framework.setup.services.alembic import Alembic
 
 class SetupController:
     def __init__(self, apiController: ApiController,  jwt: JWT):

liberty/{controllers → framework/controllers}/socket_controller.py

@@ -7,7 +7,7 @@ from fastapi.responses import JSONResponse, HTMLResponse
 from typing import Optional
 from socketio import ASGIApp, AsyncServer
 from fastapi import FastAPI
-from liberty.controllers.api_controller import ApiController
+from liberty.framework.controllers.api_controller import ApiController
 
 class SocketController:
     def __init__(self, io: Optional[AsyncServer] = None):

liberty/{database → framework/database}/base_dao.py

@@ -9,7 +9,7 @@ from sqlalchemy import text
 import re
 from abc import abstractmethod
 import json
-from liberty.business.postgres import PostgresQuery
+from liberty.framework.business.postgres import PostgresQuery
 
 class BaseDAO:
     def __init__(self, config: dict):

liberty/{database → framework/database}/ora_dao.py

@@ -4,9 +4,9 @@ import re
 from sqlalchemy import text
 from sqlalchemy.ext.asyncio import create_async_engine
 from sqlalchemy.ext.asyncio import AsyncSession
-from liberty.database.base_dao import BaseDAO
-from liberty.utils.common import PoolConfig
-from liberty.business.oracle import OracleQuery
+from liberty.framework.database.base_dao import BaseDAO
+from liberty.framework.utils.common import PoolConfig
+from liberty.framework.business.oracle import OracleQuery
 from sqlalchemy.orm import sessionmaker
 from typing import Dict, List
 

liberty/{database → framework/database}/pg_dao.py

@@ -3,8 +3,8 @@ logger = logging.getLogger(__name__)
 import re
 from sqlalchemy import text
 from sqlalchemy.ext.asyncio import create_async_engine
-from liberty.database.base_dao import BaseDAO
-from liberty.business.postgres import PostgresQuery
+from liberty.framework.database.base_dao import BaseDAO
+from liberty.framework.business.postgres import PostgresQuery
 from typing import Dict, List
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy.orm import sessionmaker

liberty/{main.py → framework/main.py}

@@ -14,19 +14,19 @@ from fastapi import FastAPI, HTTPException, Query, Request
 from fastapi.staticfiles import StaticFiles
 from fastapi_socketio import SocketManager
 import uvicorn
-from liberty.utils.jwt import JWT
-from liberty.controllers.setup_controller import SetupController
-from liberty.controllers.api_controller import ApiController
-from liberty.controllers.socket_controller import SocketController
-from liberty.routes.api_routes import setup_api_routes
-from liberty.routes.react_routes import setup_react_routes
-from liberty.routes.socket_routes import setup_socket_routes
-from liberty.routes.setup_routes import setup_setup_routes
-from liberty.config import get_db_properties_path
+from liberty.framework.utils.jwt import JWT
+from liberty.framework.controllers.setup_controller import SetupController
+from liberty.framework.controllers.api_controller import ApiController
+from liberty.framework.controllers.socket_controller import SocketController
+from liberty.framework.routes.api_routes import setup_api_routes
+from liberty.framework.routes.react_routes import setup_react_routes
+from liberty.framework.routes.socket_routes import setup_socket_routes
+from liberty.framework.routes.setup_routes import setup_setup_routes
+from liberty.framework.config import get_db_properties_path
 from contextlib import asynccontextmanager
-from liberty.public import get_frontend_assets_path, get_offline_assets_path, get_setup_assets_path
-from liberty.services.rest_services import Rest
-from liberty.services.api_services import API
+from liberty.framework.public import get_frontend_assets_path, get_offline_assets_path, get_setup_assets_path
+from liberty.framework.services.rest_services import Rest
+from liberty.framework.services.api_services import API
 
 
 class BackendAPI:
@@ -217,7 +217,7 @@ async def lifespan(app: FastAPI):
 
 def main():
     """Entry point for running the application."""
-    config = uvicorn.Config("liberty.main:app", host="0.0.0.0", port=8000, reload=True, log_level="warning")
+    config = uvicorn.Config("liberty.framework.main:app", host="0.0.0.0", port=8000, reload=True, log_level="warning")
     server = uvicorn.Server(config)
     
     try: