fix: pass 'hermes-web-cli' module name to get_module_dbname()
env.get_module_dbname() requires the module name argument. All 13
call sites updated from get_module_dbname() to
get_module_dbname('hermes-web-cli').
This commit is contained in:
parent
361969a34f
commit
9396aaed21
@ -67,7 +67,7 @@ async def get_all_services(orgid: str) -> List[Dict]:
|
|||||||
# Query services table with orgid filter using sqlor-database-module
|
# Query services table with orgid filter using sqlor-database-module
|
||||||
db = DBPools()
|
db = DBPools()
|
||||||
env = ServerEnv()
|
env = ServerEnv()
|
||||||
dbname = env.get_module_dbname()
|
dbname = env.get_module_dbname('hermes-web-cli')
|
||||||
async with db.sqlorContext(dbname) as sor:
|
async with db.sqlorContext(dbname) as sor:
|
||||||
sql_template = SERVICES_CRUD['operations']['read_all']['sql_template']
|
sql_template = SERVICES_CRUD['operations']['read_all']['sql_template']
|
||||||
recs = await sor.sqlExe(sql_template, {'orgid': orgid})
|
recs = await sor.sqlExe(sql_template, {'orgid': orgid})
|
||||||
@ -111,7 +111,7 @@ async def create_service(name: str, url: str, orgid: str, description: str = "",
|
|||||||
# Save to database using sqlor-database-module
|
# Save to database using sqlor-database-module
|
||||||
db = DBPools()
|
db = DBPools()
|
||||||
env = ServerEnv()
|
env = ServerEnv()
|
||||||
dbname = env.get_module_dbname()
|
dbname = env.get_module_dbname('hermes-web-cli')
|
||||||
async with db.sqlorContext(dbname) as sor:
|
async with db.sqlorContext(dbname) as sor:
|
||||||
sql_template = SERVICES_CRUD['operations']['create']['sql_template']
|
sql_template = SERVICES_CRUD['operations']['create']['sql_template']
|
||||||
await sor.sqlExe(sql_template, {
|
await sor.sqlExe(sql_template, {
|
||||||
@ -153,7 +153,7 @@ async def delete_service(service_id: str, orgid: str) -> bool:
|
|||||||
# Delete from database using sqlor-database-module
|
# Delete from database using sqlor-database-module
|
||||||
db = DBPools()
|
db = DBPools()
|
||||||
env = ServerEnv()
|
env = ServerEnv()
|
||||||
dbname = env.get_module_dbname()
|
dbname = env.get_module_dbname('hermes-web-cli')
|
||||||
async with db.sqlorContext(dbname) as sor:
|
async with db.sqlorContext(dbname) as sor:
|
||||||
sql_template = SERVICES_CRUD['operations']['delete']['sql_template']
|
sql_template = SERVICES_CRUD['operations']['delete']['sql_template']
|
||||||
await sor.sqlExe(sql_template, {
|
await sor.sqlExe(sql_template, {
|
||||||
@ -163,7 +163,7 @@ async def delete_service(service_id: str, orgid: str) -> bool:
|
|||||||
|
|
||||||
# Also delete associated sessions
|
# Also delete associated sessions
|
||||||
env = ServerEnv()
|
env = ServerEnv()
|
||||||
dbname = env.get_module_dbname()
|
dbname = env.get_module_dbname('hermes-web-cli')
|
||||||
async with db.sqlorContext(dbname) as sor:
|
async with db.sqlorContext(dbname) as sor:
|
||||||
await sor.sqlExe("""
|
await sor.sqlExe("""
|
||||||
DELETE FROM sessions
|
DELETE FROM sessions
|
||||||
@ -191,7 +191,7 @@ async def get_service_by_id(service_id: str, orgid: str) -> Optional[Dict]:
|
|||||||
# Query database directly with orgid filter for security
|
# Query database directly with orgid filter for security
|
||||||
db = DBPools()
|
db = DBPools()
|
||||||
env = ServerEnv()
|
env = ServerEnv()
|
||||||
dbname = env.get_module_dbname()
|
dbname = env.get_module_dbname('hermes-web-cli')
|
||||||
async with db.sqlorContext(dbname) as sor:
|
async with db.sqlorContext(dbname) as sor:
|
||||||
sql_template = SERVICES_CRUD['operations']['read_by_id']['sql_template']
|
sql_template = SERVICES_CRUD['operations']['read_by_id']['sql_template']
|
||||||
recs = await sor.sqlExe(sql_template, {
|
recs = await sor.sqlExe(sql_template, {
|
||||||
@ -228,7 +228,7 @@ async def test_service_connection(service_id: str, orgid: str = "") -> Tuple[boo
|
|||||||
# Get service configuration from database
|
# Get service configuration from database
|
||||||
db = DBPools()
|
db = DBPools()
|
||||||
env = ServerEnv()
|
env = ServerEnv()
|
||||||
dbname = env.get_module_dbname()
|
dbname = env.get_module_dbname('hermes-web-cli')
|
||||||
async with db.sqlorContext(dbname) as sor:
|
async with db.sqlorContext(dbname) as sor:
|
||||||
if orgid:
|
if orgid:
|
||||||
sql_template = SERVICES_CRUD['operations']['read_by_id']['sql_template']
|
sql_template = SERVICES_CRUD['operations']['read_by_id']['sql_template']
|
||||||
@ -315,7 +315,7 @@ async def create_session(service_id: str, user_id: str, orgid: str, user_message
|
|||||||
# Create local session record in database
|
# Create local session record in database
|
||||||
db = DBPools()
|
db = DBPools()
|
||||||
env = ServerEnv()
|
env = ServerEnv()
|
||||||
dbname = env.get_module_dbname()
|
dbname = env.get_module_dbname('hermes-web-cli')
|
||||||
async with db.sqlorContext(dbname) as sor:
|
async with db.sqlorContext(dbname) as sor:
|
||||||
sql_template = SESSIONS_CRUD['operations']['create']['sql_template']
|
sql_template = SESSIONS_CRUD['operations']['create']['sql_template']
|
||||||
await sor.sqlExe(sql_template, {
|
await sor.sqlExe(sql_template, {
|
||||||
@ -433,7 +433,7 @@ async def get_session_messages(session_id: str, user_id: str, orgid: str) -> Lis
|
|||||||
# Update session last_active timestamp and message count in local database
|
# Update session last_active timestamp and message count in local database
|
||||||
db = DBPools()
|
db = DBPools()
|
||||||
env = ServerEnv()
|
env = ServerEnv()
|
||||||
dbname = env.get_module_dbname()
|
dbname = env.get_module_dbname('hermes-web-cli')
|
||||||
async with db.sqlorContext(dbname) as sor:
|
async with db.sqlorContext(dbname) as sor:
|
||||||
await sor.sqlExe("""
|
await sor.sqlExe("""
|
||||||
UPDATE sessions
|
UPDATE sessions
|
||||||
@ -465,7 +465,7 @@ async def get_active_sessions(user_id: str) -> List[Dict]:
|
|||||||
# Query the sessions table for active sessions belonging to current user using sqlor-database-module
|
# Query the sessions table for active sessions belonging to current user using sqlor-database-module
|
||||||
db = DBPools()
|
db = DBPools()
|
||||||
env = ServerEnv()
|
env = ServerEnv()
|
||||||
dbname = env.get_module_dbname()
|
dbname = env.get_module_dbname('hermes-web-cli')
|
||||||
async with db.sqlorContext(dbname) as sor:
|
async with db.sqlorContext(dbname) as sor:
|
||||||
sql_template = SESSIONS_CRUD['operations']['read_active']['sql_template']
|
sql_template = SESSIONS_CRUD['operations']['read_active']['sql_template']
|
||||||
recs = await sor.sqlExe(sql_template, {'user_id': user_id})
|
recs = await sor.sqlExe(sql_template, {'user_id': user_id})
|
||||||
@ -500,7 +500,7 @@ async def get_recent_sessions(user_id: str, limit: int = 5) -> List[Dict]:
|
|||||||
# Query the sessions table for recent sessions belonging to current user using sqlor-database-module
|
# Query the sessions table for recent sessions belonging to current user using sqlor-database-module
|
||||||
db = DBPools()
|
db = DBPools()
|
||||||
env = ServerEnv()
|
env = ServerEnv()
|
||||||
dbname = env.get_module_dbname()
|
dbname = env.get_module_dbname('hermes-web-cli')
|
||||||
async with db.sqlorContext(dbname) as sor:
|
async with db.sqlorContext(dbname) as sor:
|
||||||
sql_template = SESSIONS_CRUD['operations']['read_recent']['sql_template']
|
sql_template = SESSIONS_CRUD['operations']['read_recent']['sql_template']
|
||||||
recs = await sor.sqlExe(sql_template, {'user_id': user_id, 'limit': limit})
|
recs = await sor.sqlExe(sql_template, {'user_id': user_id, 'limit': limit})
|
||||||
@ -535,7 +535,7 @@ async def get_session_by_id(session_id: str, user_id: str) -> Optional[Dict]:
|
|||||||
# Query database directly with user_id filter for security
|
# Query database directly with user_id filter for security
|
||||||
db = DBPools()
|
db = DBPools()
|
||||||
env = ServerEnv()
|
env = ServerEnv()
|
||||||
dbname = env.get_module_dbname()
|
dbname = env.get_module_dbname('hermes-web-cli')
|
||||||
async with db.sqlorContext(dbname) as sor:
|
async with db.sqlorContext(dbname) as sor:
|
||||||
sql_template = SESSIONS_CRUD['operations']['read_by_id']['sql_template']
|
sql_template = SESSIONS_CRUD['operations']['read_by_id']['sql_template']
|
||||||
recs = await sor.sqlExe(sql_template, {
|
recs = await sor.sqlExe(sql_template, {
|
||||||
@ -600,7 +600,7 @@ async def get_setting(user_id: str) -> Dict:
|
|||||||
# Query user settings from database
|
# Query user settings from database
|
||||||
db = DBPools()
|
db = DBPools()
|
||||||
env = ServerEnv()
|
env = ServerEnv()
|
||||||
dbname = env.get_module_dbname()
|
dbname = env.get_module_dbname('hermes-web-cli')
|
||||||
async with db.sqlorContext(dbname) as sor:
|
async with db.sqlorContext(dbname) as sor:
|
||||||
sql_template = SETTINGS_CRUD['operations']['read']['sql_template']
|
sql_template = SETTINGS_CRUD['operations']['read']['sql_template']
|
||||||
recs = await sor.sqlExe(sql_template, {'user_id': user_id})
|
recs = await sor.sqlExe(sql_template, {'user_id': user_id})
|
||||||
@ -650,7 +650,7 @@ async def save_setting(section: str, key: str, value, user_id: str) -> bool:
|
|||||||
# Save to database using sqlor-database-module
|
# Save to database using sqlor-database-module
|
||||||
db = DBPools()
|
db = DBPools()
|
||||||
env = ServerEnv()
|
env = ServerEnv()
|
||||||
dbname = env.get_module_dbname()
|
dbname = env.get_module_dbname('hermes-web-cli')
|
||||||
async with db.sqlorContext(dbname) as sor:
|
async with db.sqlorContext(dbname) as sor:
|
||||||
sql_template = SETTINGS_CRUD['operations']['create_or_update']['sql_template']
|
sql_template = SETTINGS_CRUD['operations']['create_or_update']['sql_template']
|
||||||
await sor.sqlExe(sql_template, {
|
await sor.sqlExe(sql_template, {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user