yaso_meth/mih-project
2
4
Fork 2
Code Issues 8 Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Update API files for new architechure

Browse Source
This commit is contained in:
Yasien Mac Mini
2026-01-29 13:02:05 +02:00
parent 38c40e2dfe
commit 9e19dc0fa4
4 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mih_api_hub/Minio_Storage/minioConnection.py
View File

@@ -9,7 +9,7 @@ minioSecret = os.getenv("MINIO_SECRET_KEY")
def minioConnect(env): def minioConnect(env):
if(env == "Dev"): if(env == "Dev"):
return Minio( return Minio(
endpoint="minio:9000", endpoint="mih-minio:9000",
# "minio.mzansi-innovation-hub.co.za", # "minio.mzansi-innovation-hub.co.za",
access_key=minioAccess, access_key=minioAccess,
secret_key=minioSecret, secret_key=minioSecret,
@@ -17,7 +17,7 @@ def minioConnect(env):
) )
else: else:
return Minio( return Minio(
# endpoint="minio:9000", # endpoint="mih-minio:9000",
endpoint="minio.mzansi-innovation-hub.co.za", endpoint="minio.mzansi-innovation-hub.co.za",
access_key=minioAccess, access_key=minioAccess,
secret_key=minioSecret, secret_key=minioSecret,

2
mih_api_hub/main.py
View File

@@ -54,7 +54,7 @@ init(
), ),
supertokens_config=SupertokensConfig( supertokens_config=SupertokensConfig(
# https://try.supertokens.com is for demo purposes. Replace this with the address of your core instance (sign up on supertokens.com), or self host a core. # https://try.supertokens.com is for demo purposes. Replace this with the address of your core instance (sign up on supertokens.com), or self host a core.
connection_uri="http://MIH-SuperTokens:3567/", connection_uri="http://mih-supertokens:3567/",
api_key="leatucczyixqwkqqdrhayiwzeofkltds" api_key="leatucczyixqwkqqdrhayiwzeofkltds"
), ),
framework='fastapi', framework='fastapi',

14
mih_api_hub/mih_database/dbConnection.py
View File

@@ -8,7 +8,7 @@ dbPass = os.getenv("DB_PASSWD")
def dbPatientManagerConnect(): def dbPatientManagerConnect():
return mysql.connector.connect( return mysql.connector.connect(
host="mysqldb", host="mih-db",
user=dbUser, user=dbUser,
passwd=dbPass, passwd=dbPass,
database="patient_manager" database="patient_manager"
@@ -16,7 +16,7 @@ def dbPatientManagerConnect():
def dbAppDataConnect(): def dbAppDataConnect():
return mysql.connector.connect( return mysql.connector.connect(
host="mysqldb", host="mih-db",
user=dbUser, user=dbUser,
passwd=dbPass, passwd=dbPass,
database="app_data" database="app_data"
@@ -24,7 +24,7 @@ def dbAppDataConnect():
def dbDataAccessConnect(): def dbDataAccessConnect():
return mysql.connector.connect( return mysql.connector.connect(
host="mysqldb", host="mih-db",
user=dbUser, user=dbUser,
passwd=dbPass, passwd=dbPass,
database="data_access" database="data_access"
@@ -32,7 +32,7 @@ def dbDataAccessConnect():
def dbMzansiWalletConnect(): def dbMzansiWalletConnect():
return mysql.connector.connect( return mysql.connector.connect(
host="mysqldb", host="mih-db",
user=dbUser, user=dbUser,
passwd=dbPass, passwd=dbPass,
database="mzansi_wallet" database="mzansi_wallet"
@@ -40,7 +40,7 @@ def dbMzansiWalletConnect():
def dbMzansiDirectoryConnect(): def dbMzansiDirectoryConnect():
return mysql.connector.connect( return mysql.connector.connect(
host="mysqldb", host="mih-db",
user=dbUser, user=dbUser,
passwd=dbPass, passwd=dbPass,
database="mzansi_directory" database="mzansi_directory"
@@ -48,7 +48,7 @@ def dbMzansiDirectoryConnect():
def dbMzansiCalendarConnect(): def dbMzansiCalendarConnect():
return mysql.connector.connect( return mysql.connector.connect(
host="mysqldb", host="mih-db",
user=dbUser, user=dbUser,
passwd=dbPass, passwd=dbPass,
database="mzansi_calendar" database="mzansi_calendar"
@@ -56,7 +56,7 @@ def dbMzansiCalendarConnect():
def dbAllConnect(): def dbAllConnect():
return mysql.connector.connect( return mysql.connector.connect(
host="mysqldb", host="mih-db",
user=dbUser, user=dbUser,
passwd=dbPass, passwd=dbPass,
) )

16
mih_api_hub/mih_database/mihDbConnections.py
View File

@@ -7,7 +7,7 @@ from dotenv import load_dotenv
load_dotenv() load_dotenv()
dbUser = os.getenv("DB_USER") dbUser = os.getenv("DB_USER")
dbPass = os.getenv("DB_PASSWD") dbPass = os.getenv("DB_PASSWD")
dbHost = "mysqldb" dbHost = "mih-db"
dbPort = 3306 dbPort = 3306
encoded_dbPass = quote_plus(dbPass) encoded_dbPass = quote_plus(dbPass)
base_connect_url = f"mysql+mysqlconnector://{dbUser}:{encoded_dbPass}@{dbHost}:{dbPort}/" base_connect_url = f"mysql+mysqlconnector://{dbUser}:{encoded_dbPass}@{dbHost}:{dbPort}/"
@@ -15,7 +15,7 @@ base_connect_url = f"mysql+mysqlconnector://{dbUser}:{encoded_dbPass}@{dbHost}:{
def dbPatientManagerConnect(): def dbPatientManagerConnect():
return create_engine(base_connect_url+"patient_manager", echo=False, pool_recycle=3600) return create_engine(base_connect_url+"patient_manager", echo=False, pool_recycle=3600)
# return mysql.connector.connect( # return mysql.connector.connect(
# host="mysqldb", # host="mih-db",
# user=dbUser, # user=dbUser,
# passwd=dbPass, # passwd=dbPass,
# database="patient_manager" # database="patient_manager"
@@ -24,7 +24,7 @@ def dbPatientManagerConnect():
def dbAppDataConnect(): def dbAppDataConnect():
return create_engine(base_connect_url+"app_data", echo=False, pool_recycle=3600) return create_engine(base_connect_url+"app_data", echo=False, pool_recycle=3600)
# return mysql.connector.connect( # return mysql.connector.connect(
# host="mysqldb", # host="mih-db",
# user=dbUser, # user=dbUser,
# passwd=dbPass, # passwd=dbPass,
# database="app_data" # database="app_data"
@@ -33,7 +33,7 @@ def dbAppDataConnect():
def dbDataAccessConnect(): def dbDataAccessConnect():
return create_engine(base_connect_url+"data_access", echo=False, pool_recycle=3600) return create_engine(base_connect_url+"data_access", echo=False, pool_recycle=3600)
# return mysql.connector.connect( # return mysql.connector.connect(
# host="mysqldb", # host="mih-db",
# user=dbUser, # user=dbUser,
# passwd=dbPass, # passwd=dbPass,
# database="data_access" # database="data_access"
@@ -42,7 +42,7 @@ def dbDataAccessConnect():
def dbMzansiWalletConnect(): def dbMzansiWalletConnect():
return create_engine(base_connect_url+"mzansi_wallet", echo=False, pool_recycle=3600) return create_engine(base_connect_url+"mzansi_wallet", echo=False, pool_recycle=3600)
# return mysql.connector.connect( # return mysql.connector.connect(
# host="mysqldb", # host="mih-db",
# user=dbUser, # user=dbUser,
# passwd=dbPass, # passwd=dbPass,
# database="mzansi_wallet" # database="mzansi_wallet"
@@ -51,7 +51,7 @@ def dbMzansiWalletConnect():
def dbMzansiDirectoryConnect(): def dbMzansiDirectoryConnect():
return create_engine(base_connect_url+"mzansi_directory", echo=False, pool_recycle=3600) return create_engine(base_connect_url+"mzansi_directory", echo=False, pool_recycle=3600)
# return mysql.connector.connect( # return mysql.connector.connect(
# host="mysqldb", # host="mih-db",
# user=dbUser, # user=dbUser,
# passwd=dbPass, # passwd=dbPass,
# database="mzansi_directory" # database="mzansi_directory"
@@ -60,7 +60,7 @@ def dbMzansiDirectoryConnect():
def dbMzansiCalendarConnect(): def dbMzansiCalendarConnect():
return create_engine(base_connect_url+"mzansi_calendar", echo=False, pool_recycle=3600) return create_engine(base_connect_url+"mzansi_calendar", echo=False, pool_recycle=3600)
# return mysql.connector.connect( # return mysql.connector.connect(
# host="mysqldb", # host="mih-db",
# user=dbUser, # user=dbUser,
# passwd=dbPass, # passwd=dbPass,
# database="mzansi_calendar" # database="mzansi_calendar"
@@ -69,7 +69,7 @@ def dbMzansiCalendarConnect():
def dbAllConnect(): def dbAllConnect():
return create_engine(base_connect_url, echo=False, pool_recycle=3600) return create_engine(base_connect_url, echo=False, pool_recycle=3600)
# return mysql.connector.connect( # return mysql.connector.connect(
# host="mysqldb", # host="mih-db",
# user=dbUser, # user=dbUser,
# passwd=dbPass, # passwd=dbPass,
# ) # )