MERMS/MermsCoreFlask
1
0
Fork 0
Code Issues Pull Requests Releases Activity

fix image load

Browse Source
This commit is contained in:
CHIEFSOFT\ameye
2026-01-17 19:04:06 -05:00
parent 581941dba8
commit 2d8993150b
4 changed files with 174 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/api/services/web_contents.py
+30 -30
View File
@@ -71,7 +71,7 @@ class WebContentsService(BaseService):
if selectedTemplate:
selected_flavor = selectedTemplate.flavor
WebContentsService.get_site_imges_data(provision_uid, membersSubResult.primary_server,
BaseService.get_site_imges_data(provision_uid, membersSubResult.primary_server,
membersSubResult.provision_port, selected_flavor)
if membersSubResult.colorstyle is not None and membersSubResult.colorstyle != '':
@@ -144,32 +144,32 @@ class WebContentsService(BaseService):
logger.error(f"An error occurred while getting dashboard data: {str(e)}", exc_info=True)
return jsonify({"message": "Internal Server Error"}), 500
@staticmethod
def get_site_imges_data(provision_uid, primary_server, provision_port, selected_flavor):
destination_server = "http://" + str(primary_server) + ":" + str(provision_port)
api_url = destination_server + "/api/props"
try:
payload = {'provision_uid': provision_uid, 'flavor': selected_flavor}
logger.info(f"api_url: {str(api_url)}")
logger.info(f"selected_flavor: {str(selected_flavor)}")
# Make the GET request
res_data = []
response = requests.get(api_url, params=payload)
if response.status_code == 200:
logger.info(f"Response Site Images: {res_data}")
# Convert the JSON response to a Python dictionary
res_data = response.json()
logger.info(f"Response Site Images: {res_data}")
response_data = {
"provision_uid": provision_uid,
"data": res_data,
# "product_id": product_id,
}
return response_data
except Exception as e:
logger.error(f"An error occurred while get_site_imges_data data: {str(e)}", exc_info=True)
return None
# @staticmethod
# def get_site_imges_data(provision_uid, primary_server, provision_port, selected_flavor):
# destination_server = "http://" + str(primary_server) + ":" + str(provision_port)
# api_url = destination_server + "/api/props"
# try:
# payload = {'provision_uid': provision_uid, 'flavor': selected_flavor}
# logger.info(f"api_url: {str(api_url)}")
# logger.info(f"selected_flavor: {str(selected_flavor)}")
#
# # Make the GET request
# res_data = []
# response = requests.get(api_url, params=payload)
# if response.status_code == 200:
# logger.info(f"Response Site Images: {res_data}")
# # Convert the JSON response to a Python dictionary
# res_data = response.json()
# logger.info(f"Response Site Images: {res_data}")
#
# response_data = {
# "provision_uid": provision_uid,
# "data": res_data,
# # "product_id": product_id,
# }
#
# return response_data
#
# except Exception as e:
# logger.error(f"An error occurred while get_site_imges_data data: {str(e)}", exc_info=True)
# return None