liberty-framework 6.0.44__tar.gz → 6.0.46__tar.gz

{liberty_framework-6.0.44 → liberty_framework-6.0.46}/MANIFEST.in

@@ -1,5 +1,6 @@
 include requirements.txt
 include LICENSE
+include README.md
 recursive-include app *
 recursive-include tests *   
 exclude app/config/files/db.properties

liberty_framework-6.0.46/PKG-INFO

@@ -0,0 +1,224 @@
+Metadata-Version: 2.2
+Name: liberty-framework
+Version: 6.0.46
+Summary: Liberty Framework
+Author: Franck Blettner
+Author-email: franck.blettner@nomana-it.fr
+Classifier: Programming Language :: Python :: 3
+Classifier: Framework :: FastAPI
+Classifier: Operating System :: OS Independent
+Requires-Python: >=3.8
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: alembic==1.14.1
+Requires-Dist: allure-pytest==2.13.5
+Requires-Dist: allure-python-commons==2.13.5
+Requires-Dist: annotated-types==0.7.0
+Requires-Dist: anyio==4.8.0
+Requires-Dist: asyncpg==0.30.0
+Requires-Dist: attrs==25.1.0
+Requires-Dist: bidict==0.23.1
+Requires-Dist: certifi==2024.12.14
+Requires-Dist: cffi==1.17.1
+Requires-Dist: click==8.1.8
+Requires-Dist: cryptography==44.0.0
+Requires-Dist: dnspython==2.7.0
+Requires-Dist: email_validator==2.2.0
+Requires-Dist: fastapi==0.115.7
+Requires-Dist: fastapi-cli==0.0.7
+Requires-Dist: fastapi-socketio==0.0.10
+Requires-Dist: greenlet==3.1.1
+Requires-Dist: h11==0.14.0
+Requires-Dist: httpcore==1.0.7
+Requires-Dist: httptools==0.6.4
+Requires-Dist: httpx==0.28.1
+Requires-Dist: idna==3.10
+Requires-Dist: inflect==7.5.0
+Requires-Dist: iniconfig==2.0.0
+Requires-Dist: Jinja2==3.1.5
+Requires-Dist: Mako==1.3.8
+Requires-Dist: markdown-it-py==3.0.0
+Requires-Dist: MarkupSafe==3.0.2
+Requires-Dist: mdurl==0.1.2
+Requires-Dist: more-itertools==10.6.0
+Requires-Dist: oracledb==2.4.1
+Requires-Dist: packaging==24.2
+Requires-Dist: pluggy==1.5.0
+Requires-Dist: psycopg2-binary==2.9.10
+Requires-Dist: pycparser==2.22
+Requires-Dist: pydantic==2.10.6
+Requires-Dist: pydantic_core==2.27.2
+Requires-Dist: Pygments==2.19.1
+Requires-Dist: PyJWT==2.10.1
+Requires-Dist: pytest==8.3.4
+Requires-Dist: python-dotenv==1.0.1
+Requires-Dist: python-engineio==4.11.2
+Requires-Dist: python-multipart==0.0.20
+Requires-Dist: python-socketio==5.12.1
+Requires-Dist: PyYAML==6.0.2
+Requires-Dist: rich==13.9.4
+Requires-Dist: rich-toolkit==0.13.2
+Requires-Dist: setuptools==75.8.0
+Requires-Dist: shellingham==1.5.4
+Requires-Dist: simple-websocket==1.1.0
+Requires-Dist: sniffio==1.3.1
+Requires-Dist: SQLAlchemy==2.0.37
+Requires-Dist: starlette==0.45.3
+Requires-Dist: typeguard==4.4.1
+Requires-Dist: typer==0.15.1
+Requires-Dist: typing_extensions==4.12.2
+Requires-Dist: uvicorn==0.34.0
+Requires-Dist: uvloop==0.21.0
+Requires-Dist: watchfiles==1.0.4
+Requires-Dist: websockets==14.2
+Requires-Dist: wsproto==1.2.0
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
+
+# 📖 Liberty Framework  
+### A Scalable and Extensible FastAPI and React Framework for Business Applications  
+
+## Announcements
+- **Release 6.0.46**: Implement call for custom rest api, add drop and create database for framework
+
+🚀 **Liberty Framework** is a powerful, modular, and extensible **FastAPI-based and React-based framework** designed to streamline backend development for business applications. It provides **database management, authentication, real-time socket communication, and more**, making it easy to deploy and scale enterprise solutions.  
+
+- Online demo is available at [https://liberty.nomana-it.fr](https://liberty.nomana-it.fr)
+- Web page at: [https://nomana-it.fr](https://nomana-it.fr)
+
+```ini
+Login = demo
+Password = demo
+Appplication = LIBERTY, NOMASX-1 and NOMAJDE
+```
+
+![liberty](https://github.com/user-attachments/assets/74479874-d7ba-469a-b525-b468529c4432)
+
+---
+
+## ✨ Features  
+✅ **FastAPI-based** – High-performance backend with asynchronous capabilities.  
+✅ **React-based** – Beautiful and responsive frontend without any dependencies to components.  
+✅ **Database Management** – SQLAlchemy, Alembic for migrations, and PostgreSQL support.  
+✅ **Real-Time Communication** – Integrated WebSocket (Socket.IO) for live updates.  
+✅ **Authentication & Security** – JWT authentication, encryption, and role-based access.  
+✅ **Automated Database Migrations** – Alembic versioning for multiple databases.  
+✅ **Easy Installation & Deployment** – Available as a **Python package** and **Docker image**.  
+✅ **Extensible** – Plugin-based architecture to support future enhancements.  
+
+## ✨ Enterprise additional features
+  - 🌐 **Traefik**: A powerful reverse proxy for routing and load balancing.
+  - ⚙️ **AirFlow**: Automate and manage workflows effortlessly.
+  - 🐘 **pgAdmin**: Manage your PostgreSQL database visually with ease.
+  - 🔐 **KeyCloak**: OIDC Service for authentication
+  - 📂 **Gitea**: Git Repository to manage dags, plugins, backup
+
+---
+
+## 📦 Installation  
+
+### Requirements
+A PostgreSQL 16 database is required. You can either:
+  - Create a Docker image based on postgres:16, or
+  - Install PostgreSQL 16 directly on your host system.
+
+For easier setup and to ensure compatibility with future enterprise features, it is recommended to create a database with a user named liberty.
+
+### **Option 1: Install via `pip`**
+```bash
+pip install liberty-framework
+```
+
+
+---
+
+## 🚀 Quick Start  
+After installation, you can **start the framework** with:  
+```bash
+liberty-start
+```
+
+---
+
+## ⚙️ URL
+
+### Installation URL
+- Setup: `http://<your_host>:<your_port>/setup`
+- Application: `http://<your_host>:<your_port>`
+- API Documentation: `http://<your_host>:<your_port>/api`
+- Swagger: `http://<your_host>:<your_port>/api/test`
+
+### Demo URL
+- Setup: [https://liberty.nomana-it.fr/setup](https://liberty.nomana-it.fr/setup)
+- Application: [https://liberty.nomana-it.fr](https://liberty.nomana-it.fr)
+- API Documentation: [https://liberty.nomana-it.fr/api](https://liberty.nomana-it.fr/api)
+- Swagger: [https://liberty.nomana-it.fr/api/test](https://liberty.nomana-it.fr/api/test)
+
+---
+
+## 📖 Documentation  
+- **Reference**: [https://docs.nomana-it.fr/liberty](https://docs.nomana-it.fr/liberty)
+
+---
+
+## 🤝 Contributing  
+We welcome contributions! Here’s how you can help:  
+1. **Fork** this repository.  
+2. **Clone** your fork:  
+   ```bash
+   git clone https://github.com/fblettner/liberty-framework.git
+   ```
+3. **Create a new branch** for your feature:  
+   ```bash
+   git checkout -b feature-name
+   ```
+4. **Commit your changes**:  
+   ```bash
+   git commit -m "Add new feature"
+   ```
+5. **Push to your fork** and **submit a Pull Request**:  
+   ```bash
+   git push origin feature-name
+   ```
+6. **Join discussions** and help improve the framework!  
+
+---
+
+## 💖 Sponsorship  
+If you find **Liberty Framework** useful and would like to support its development, consider sponsoring us. Your contributions help maintain the project, add new features, and improve the documentation. Every contribution, big or small, is greatly appreciated!  
+
+To sponsor, visit: **[GitHub Sponsors](https://github.com/sponsors/fblettner)** or reach out to us directly.  
+
+---
+
+## 📜 License  
+Liberty Framework is **open-source software** licensed under the **AGPL License**.  
+Enterprise features require a license:
+  - **NOMASX-1**: Security management, Segregation of duties and licenses compliancy
+  - **NOMAJDE** JD-Edwards integration
+  - **Airflow Plugins**: Automatic database backup, database synchronisation...
+  - **Liberty AI**: Currently, OpenAI is set into the configuration, you have to use your own account without enterprise features license
+
+---
+
+## 📧 Contact & Support  
+If you have questions or need support:  
+- **Email**: [franck.blettner@nomana-it.fr](mailto:franck.blettner@nomana-it.fr)  
+- **GitHub Issues**: [Report an issue](https://github.com/fblettner/liberty-framework/issues)  
+- **Discussions**: Join the conversation in the **GitHub Discussions** section.  
+
+---
+
+### ⭐ If you find Liberty Framework useful, consider giving it a star on GitHub!  
+```bash
+git clone https://github.com/fblettner/liberty-framework.git
+cd liberty-framework
+```
+
+🚀 **Let's build the future of business applications together!** 🚀  

{liberty_framework-6.0.44 → liberty_framework-6.0.46}/README.md

@@ -1,6 +1,9 @@
 # 📖 Liberty Framework  
 ### A Scalable and Extensible FastAPI and React Framework for Business Applications  
 
+## Announcements
+- **Release 6.0.46**: Implement call for custom rest api, add drop and create database for framework
+
 🚀 **Liberty Framework** is a powerful, modular, and extensible **FastAPI-based and React-based framework** designed to streamline backend development for business applications. It provides **database management, authentication, real-time socket communication, and more**, making it easy to deploy and scale enterprise solutions.  
 
 - Online demo is available at [https://liberty.nomana-it.fr](https://liberty.nomana-it.fr)

{liberty_framework-6.0.44 → liberty_framework-6.0.46}/app/controllers/api_controller.py

@@ -76,4 +76,6 @@ class ApiController:
     
     async def ai_welcome(self, req: Request):
         return await self.apiRest.ai_welcome(req)      
-        
+        
+    async def rest(self, req: Request):
+        return await self.apiRest.rest(req)          

{liberty_framework-6.0.44 → liberty_framework-6.0.46}/app/controllers/setup_controller.py

@@ -37,4 +37,10 @@ class SetupController:
         return self.alembic.revision(req)          
     
     def current(self, req: Request):
-        return self.alembic.current(req)           
+        return self.alembic.current(req)           
+    
+    async def create(self, req: Request):
+        return await self.setupRest.create_database(req)    
+    
+    async def drop(self, req: Request):
+        return await self.setupRest.drop_database(req)        

{liberty_framework-6.0.44 → liberty_framework-6.0.46}/app/logs/files/logs-frontend-json.log

@@ -201,3 +201,6 @@
 {"timestamp": "2025-02-20T09:15:08.302464+00:00", "transactionName": "QueryDAO.applications", "level": "info", "method": "GET", "url": "http://localhost:5173/api/fmw/applications", "data": {"message": "Request failed with status code 500: undefined"}, "message": "Framework: Load Applications", "category": "http", "feature": "database-api", "isException": true}
 {"timestamp": "2025-02-20T09:15:08.303872+00:00", "transactionName": "loginUtils.getApplications", "level": "info", "method": null, "url": null, "data": {"status": "error", "items": [{"message": "Request failed with status code 500: undefined"}]}, "message": "Login: Failed to fetch applications", "category": "debug", "feature": "console", "isException": true}
 {"timestamp": "2025-02-20T09:20:53.819597+00:00", "transactionName": "QueryDAO.login", "level": "info", "method": "GET", "url": "http://localhost:5173/api/auth/user?user=admin&pool=libnsx1&mode=session", "data": {"message": "Request failed with status code 500: Error creating pool: Error creating pool: [Errno 8] nodename nor servname provided, or not known"}, "message": "User Login: Get User Properties", "category": "http", "feature": "database-api", "isException": true}
+{"timestamp": "2025-02-26T15:16:17.684769+00:00", "transactionName": "APIDAO.post", "level": "info", "method": "POST", "url": "http://localhost:5173/api/rest?pool=default&mode=session&api=1", "data": null, "message": "REST: Failed POST API call", "category": "http", "feature": "rest-api", "isException": true}
+{"timestamp": "2025-02-26T16:00:40.041233+00:00", "transactionName": "APIDAO.post", "level": "info", "method": "POST", "url": "http://localhost:5173/api/rest?pool=default&mode=session&api=1", "data": null, "message": "REST: Failed POST API call", "category": "http", "feature": "rest-api", "isException": true}
+{"timestamp": "2025-02-26T16:27:09.583000+00:00", "transactionName": "APIDAO.post", "level": "info", "method": "POST", "url": "http://localhost:5173/api/rest?pool=default&mode=session&api=1", "data": null, "message": "REST: Failed POST API call", "category": "http", "feature": "rest-api", "isException": true}

{liberty_framework-6.0.44 → liberty_framework-6.0.46}/app/logs/files/logs-frontend-text.log

@@ -810,3 +810,15 @@ Category: debug, Feature: console, IsException: True
 Method: GET, URL: http://localhost:5173/api/auth/user?user=admin&pool=libnsx1&mode=session
 Category: http, Feature: database-api, IsException: True
 
+[2025-02-26T15:16:17.684769+00:00] [info] APIDAO.post - REST: Failed POST API call
+Method: POST, URL: http://localhost:5173/api/rest?pool=default&mode=session&api=1
+Category: http, Feature: rest-api, IsException: True
+
+[2025-02-26T16:00:40.041233+00:00] [info] APIDAO.post - REST: Failed POST API call
+Method: POST, URL: http://localhost:5173/api/rest?pool=default&mode=session&api=1
+Category: http, Feature: rest-api, IsException: True
+
+[2025-02-26T16:27:09.583000+00:00] [info] APIDAO.post - REST: Failed POST API call
+Method: POST, URL: http://localhost:5173/api/rest?pool=default&mode=session&api=1
+Category: http, Feature: rest-api, IsException: True
+

liberty_framework-6.0.46/app/models/setup.py

@@ -0,0 +1,44 @@
+from pydantic import BaseModel
+
+
+class SetupRequest(BaseModel):
+    host: str
+    port: int
+    database: str
+    user: str
+    password: str
+
+SETUP_ERROR_MESSAGE = "Setup failed"
+SETUP_RESPONSE_DESCRIPTION = "Installation successful"
+SETUP_RESPONSE_EXAMPLE = {
+    "items": [],
+    "status": "success",
+    "count": 0
+}     
+
+class CreateRequest(BaseModel):
+    host: str
+    port: int
+    database: str
+    user: str
+    password: str
+
+CREATE_ERROR_MESSAGE = "Create database failed"
+CREATE_RESPONSE_DESCRIPTION = "Create database successful"
+CREATE_RESPONSE_EXAMPLE = {
+    "items": [],
+    "status": "success",
+    "count": 0
+}     
+
+class DropRequest(BaseModel):
+    database: str
+    user: str
+
+DROP_ERROR_MESSAGE = "Drop database failed"
+DROP_RESPONSE_DESCRIPTION = "Drop Database successful"
+DROP_RESPONSE_EXAMPLE = {
+    "items": [],
+    "status": "success",
+    "count": 0
+}   

{liberty_framework-6.0.44 → liberty_framework-6.0.46}/app/routes/api_routes.py

@@ -230,7 +230,7 @@ def setup_api_routes(app, controller: ApiController, jwt: JWT):
     ):
         return await controller.close(req)
 
-
+    
     @router.get(
         "/db/query",
         response_model=GetSuccessResponse,  # Specify the success response schema
@@ -426,4 +426,66 @@ def setup_api_routes(app, controller: ApiController, jwt: JWT):
         return await controller.ai_welcome(req)   
 
 
+    @router.post(
+        "/rest",
+        response_model=PostSuccessResponse,  # Specify the success response schema
+        responses={
+            200: response_200(PostSuccessResponse, POST_APIDB_RESPONSE_DESCRIPTION, POST_APIDB_RESPONSE_EXAMPLE),
+            400: response_400("Request body cannot be empty."),
+            422: response_422(),
+            500: response_500(PostErrorResponse, POST_APIDB_ERROR_EXAMPLE),
+        },
+        summary="REST - Call Post Api",
+        description="Call a rest api (post).",
+        tags=["Query"],
+    )
+    async def post(
+        req: Request,
+        jwt: str = Depends(jwt.is_valid_jwt),
+        source: QuerySource = Query(None, description="The source to retrieve the query definition. Valid values: `framework`, `query`"),
+        type: QueryType = Query(None, description="The type of query, get data or metadata. Valid values: `table`, `columns`."),
+        pool: str = Query(None, description="The database pool alias to retrieve the query definition. (e.g., `default`, `libnsx1`)"),
+        mode: SessionMode = Query(None, description="The session mode, retrieve data from framework table or pool. Valid values: `framework`, `session`"),
+        query: int = Query(None, description="The query ID to execute. (e.g., `1`, `2`)"),
+        override_pool: Optional[str] = Query(None, description="Override the default pool set in the query definition. (e.g., `default`, `libnsx1`)"),
+        body: Dict[str, Any] = Body(..., description="JSON object with key-value pairs is required.")
+):
+        if not body:  # Check if the body is empty
+            raise HTTPException(
+                status_code=400,
+                detail="Request body cannot be empty. JSON object with key-value pairs is required.",
+            )
+        return await controller.rest(req)
+
+    @router.get(
+        "/rest",
+        response_model=PostSuccessResponse,  # Specify the success response schema
+        responses={
+            200: response_200(PostSuccessResponse, POST_APIDB_RESPONSE_DESCRIPTION, POST_APIDB_RESPONSE_EXAMPLE),
+            400: response_400("Request body cannot be empty."),
+            422: response_422(),
+            500: response_500(PostErrorResponse, POST_APIDB_ERROR_EXAMPLE),
+        },
+        summary="REST - Call Post Api",
+        description="Call a rest api (post).",
+        tags=["Query"],
+    )
+    async def get(
+        req: Request,
+        jwt: str = Depends(jwt.is_valid_jwt),
+        source: QuerySource = Query(None, description="The source to retrieve the query definition. Valid values: `framework`, `query`"),
+        type: QueryType = Query(None, description="The type of query, get data or metadata. Valid values: `table`, `columns`."),
+        pool: str = Query(None, description="The database pool alias to retrieve the query definition. (e.g., `default`, `libnsx1`)"),
+        mode: SessionMode = Query(None, description="The session mode, retrieve data from framework table or pool. Valid values: `framework`, `session`"),
+        query: int = Query(None, description="The query ID to execute. (e.g., `1`, `2`)"),
+        override_pool: Optional[str] = Query(None, description="Override the default pool set in the query definition. (e.g., `default`, `libnsx1`)"),
+        body: Dict[str, Any] = Body(..., description="JSON object with key-value pairs is required.")
+):
+        if not body:  # Check if the body is empty
+            raise HTTPException(
+                status_code=400,
+                detail="Request body cannot be empty. JSON object with key-value pairs is required.",
+            )
+        return await controller.rest(req)
+    
     app.include_router(router, prefix="/api")

{liberty_framework-6.0.44 → liberty_framework-6.0.46}/app/routes/setup_routes.py

@@ -8,7 +8,7 @@ from fastapi import APIRouter, Request
 
 from app.controllers.setup_controller import SetupController
 from app.models.base import ErrorResponse, SuccessResponse, response_200, response_422, response_500
-from app.models.setup import SETUP_ERROR_MESSAGE, SETUP_RESPONSE_DESCRIPTION, SETUP_RESPONSE_EXAMPLE, SetupRequest
+from app.models.setup import CREATE_ERROR_MESSAGE, CREATE_RESPONSE_DESCRIPTION, CREATE_RESPONSE_EXAMPLE, DROP_ERROR_MESSAGE, DROP_RESPONSE_DESCRIPTION, DROP_RESPONSE_EXAMPLE, SETUP_ERROR_MESSAGE, SETUP_RESPONSE_DESCRIPTION, SETUP_RESPONSE_EXAMPLE, CreateRequest, DropRequest, SetupRequest
 
 
 def setup_setup_routes(app, controller: SetupController):
@@ -205,4 +205,42 @@ def setup_setup_routes(app, controller: SetupController):
         ):
         return controller.current(req)
 
-    app.include_router(router, prefix="/api")
+
+    @router.post(
+        "/db/create",
+        summary="DATABASE - Create",
+        description="Create database for new application",
+        tags=["Database"], 
+        response_model=SuccessResponse,
+        responses={
+            200: response_200(SuccessResponse, CREATE_RESPONSE_DESCRIPTION, CREATE_RESPONSE_EXAMPLE),
+            422: response_422(),  
+            500: response_500(ErrorResponse, CREATE_ERROR_MESSAGE),
+        },
+    )
+    async def create(
+        req: Request,
+        body: CreateRequest,
+    ):
+        return await controller.create(req)
+    
+    @router.post(
+        "/db/drop",
+        summary="DATABASE - Drop",
+        description="Drop an existing database",
+        tags=["Database"], 
+        response_model=SuccessResponse,
+        responses={
+            200: response_200(SuccessResponse, DROP_RESPONSE_EXAMPLE, DROP_RESPONSE_DESCRIPTION),
+            422: response_422(),  
+            500: response_500(ErrorResponse, DROP_ERROR_MESSAGE),
+        },
+    )
+    async def drop(
+        req: Request,
+        body: DropRequest,
+    ):
+        return await controller.drop(req)
+    
+    app.include_router(router, prefix="/api")
+

{liberty_framework-6.0.44 → liberty_framework-6.0.46}/app/services/api_rest.py

@@ -1,11 +1,15 @@
 # Description: API REST service for handling REST API requests.
 import logging
 import os
+import re
+from urllib.parse import urljoin, urlparse
 
+from fastapi.responses import JSONResponse
 import httpx
 from pydantic import BaseModel
 
-from app.services.db_query import Query
+from app.services.db_query import Query, SessionMode
+from app.utils.encrypt import Encryption
 logger = logging.getLogger(__name__)
 
 import json
@@ -14,14 +18,12 @@ from datetime import datetime, timezone
 from app.utils.logs import LogHandler
 from app.logs import get_logs_json_path, get_logs_text_path
 
+defaultPool = "default"
+
 class ApiType:
     internal = "INTERNAL"
     external = "EXTERNAL"
 
-class ApiFramework:
-    CreateFrameworkDatabase = "CreateFrameworkDatabase"
-    DropFrameworkDatabase = "DropFrameworkDatabase"
-
 class AIResponse(BaseModel):
     message: str
     is_truncated: bool
@@ -32,6 +34,95 @@ class Rest:
         self.logs_handler = LogHandler()
         self.queryRest = queryRest
 
+    async def rest(self, req: Request):
+        try:
+            query_params = req.query_params
+
+            """Extracts OpenAI API URL and Key from MODULE_ID = 'AI'."""
+            query = {
+                "QUERY": 34,
+                "POOL": query_params.get("mode") == SessionMode.framework and defaultPool or query_params.get("pool"),
+                "CRUD": "GET",
+            }
+            context = {
+                "row_offset": 0,
+                "row_limit": 1000,
+                "where": {"API_ID":query_params.get("api")},
+            }
+            # Get the target query using the framework query method
+            target_query = await self.queryRest.db_pools.get_pool("default").db_dao.get_framework_query(
+                query, self.queryRest.db_pools.get_pool("default").db_type
+            )
+
+            api = await self.queryRest.db_pools.get_pool("default").db_dao.get(target_query, context)
+            rows = api.get("rows")
+
+            if not api.get("rows"):
+                raise ValueError("No API found")
+
+            row = rows[0]  # Extract the first row (dictionary)
+            
+            api_type = row.get("API_SOURCE")
+            method = row.get("API_METHOD")
+            url = row.get("API_URL")
+            user = row.get("API_USER")
+            password = row.get("API_PASSWORD")
+            body = row.get("API_BODY")
+
+            # Convert API_BODY from JSON string format to a Python dictionary
+            body_dict = json.loads(body)  
+
+            # 🔹 Ensure request body is retrieved properly
+            req_body = await req.json()  
+
+            # Perform variable substitution in body
+            body_str = json.dumps(body_dict)  # Convert dictionary to string for replacement
+            for key, value in req_body.items():
+                variable = rf"\${key.upper()}" 
+                body_str = re.sub(variable, str(value), body_str)  
+
+            # Convert back to dictionary
+            parsed_body = json.loads(body_str)
+            if api_type == ApiType.internal:
+                base_url = str(req.base_url) 
+                full_url = urljoin(base_url, url)  
+            else:
+                # Check if `url` is already a full external URL
+                parsed_url = urlparse(url)
+                if parsed_url.scheme and parsed_url.netloc:
+                    full_url = url  # Use the full external URL as is
+                else:
+                    raise ValueError(f"Invalid external URL: {url}")
+
+            # 🔹 Make the API call
+            async with httpx.AsyncClient(timeout=60.0) as client:
+                response = await client.post(full_url, json=parsed_body)
+                if response.status_code == 200:
+                    response_data = response.json()
+                else:
+                    response_data = {
+                        "error": f"Failed request with status code {response.status_code}",
+                        "details": response.text
+                    }
+            response_data = response.json()
+
+            return JSONResponse({
+                "items": response_data,
+                "status": "success",
+                "count": 0,
+            })
+        except Exception as err:
+            message = str(err)
+            return JSONResponse({
+                "items": [{"message": f"Error: {message}"}],
+                "status": "error",
+                "hasMore": False,
+                "limit": context.get("row_limit", 1000),
+                "offset": context.get("row_offset", 0),
+                "count": 0,
+            })
+        
+
 
     async def push_log(self, req: Request):
         """

{liberty_framework-6.0.44 → liberty_framework-6.0.46}/app/setup/services/install.py

@@ -191,3 +191,7 @@ class Install:
         except Exception as e:
             logging.error(f"Update failed: {e}")
 
+
+
+
+