From 708204df1dc2f60e1edb595fe0d320c2248965ed Mon Sep 17 00:00:00 2001 From: Adam Dangoor Date: Tue, 17 Feb 2026 08:14:46 +0000 Subject: [PATCH 1/2] Pass env details from main to helpers --- admin/create_secrets_files.py | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/admin/create_secrets_files.py b/admin/create_secrets_files.py index 48a86c636..2f70a3bb8 100644 --- a/admin/create_secrets_files.py +++ b/admin/create_secrets_files.py @@ -86,6 +86,7 @@ def _create_and_get_vumark_details( def _generate_secrets_file_content( database_details: "DatabaseDict", vumark_details: "VuMarkDatabaseDict", + inactive_database_details: dict[str, str], ) -> str: """Generate the content of a secrets file.""" return textwrap.dedent( @@ -96,11 +97,11 @@ def _generate_secrets_file_content( VUFORIA_CLIENT_ACCESS_KEY={database_details["client_access_key"]} VUFORIA_CLIENT_SECRET_KEY={database_details["client_secret_key"]} - INACTIVE_VUFORIA_TARGET_MANAGER_DATABASE_NAME={os.environ["INACTIVE_VUFORIA_TARGET_MANAGER_DATABASE_NAME"]} - INACTIVE_VUFORIA_SERVER_ACCESS_KEY={os.environ["INACTIVE_VUFORIA_SERVER_ACCESS_KEY"]} - INACTIVE_VUFORIA_SERVER_SECRET_KEY={os.environ["INACTIVE_VUFORIA_SERVER_SECRET_KEY"]} - INACTIVE_VUFORIA_CLIENT_ACCESS_KEY={os.environ["INACTIVE_VUFORIA_CLIENT_ACCESS_KEY"]} - INACTIVE_VUFORIA_CLIENT_SECRET_KEY={os.environ["INACTIVE_VUFORIA_CLIENT_SECRET_KEY"]} + INACTIVE_VUFORIA_TARGET_MANAGER_DATABASE_NAME={inactive_database_details["INACTIVE_VUFORIA_TARGET_MANAGER_DATABASE_NAME"]} + INACTIVE_VUFORIA_SERVER_ACCESS_KEY={inactive_database_details["INACTIVE_VUFORIA_SERVER_ACCESS_KEY"]} + INACTIVE_VUFORIA_SERVER_SECRET_KEY={inactive_database_details["INACTIVE_VUFORIA_SERVER_SECRET_KEY"]} + INACTIVE_VUFORIA_CLIENT_ACCESS_KEY={inactive_database_details["INACTIVE_VUFORIA_CLIENT_ACCESS_KEY"]} + INACTIVE_VUFORIA_CLIENT_SECRET_KEY={inactive_database_details["INACTIVE_VUFORIA_CLIENT_SECRET_KEY"]} VUMARK_VUFORIA_TARGET_MANAGER_DATABASE_NAME={vumark_details["database_name"]} VUMARK_VUFORIA_SERVER_ACCESS_KEY={vumark_details["server_access_key"]} @@ -121,6 +122,23 @@ def main() -> None: msg = f"Existing secrets file does not exist: {existing_secrets_file}" raise FileNotFoundError(msg) load_dotenv(dotenv_path=existing_secrets_file) + inactive_database_details = { + "INACTIVE_VUFORIA_TARGET_MANAGER_DATABASE_NAME": os.environ[ + "INACTIVE_VUFORIA_TARGET_MANAGER_DATABASE_NAME" + ], + "INACTIVE_VUFORIA_SERVER_ACCESS_KEY": os.environ[ + "INACTIVE_VUFORIA_SERVER_ACCESS_KEY" + ], + "INACTIVE_VUFORIA_SERVER_SECRET_KEY": os.environ[ + "INACTIVE_VUFORIA_SERVER_SECRET_KEY" + ], + "INACTIVE_VUFORIA_CLIENT_ACCESS_KEY": os.environ[ + "INACTIVE_VUFORIA_CLIENT_ACCESS_KEY" + ], + "INACTIVE_VUFORIA_CLIENT_SECRET_KEY": os.environ[ + "INACTIVE_VUFORIA_CLIENT_SECRET_KEY" + ], + } new_secrets_dir.mkdir(exist_ok=True) num_databases = 100 @@ -178,6 +196,7 @@ def main() -> None: file_contents = _generate_secrets_file_content( database_details=database_details, vumark_details=vumark_details, + inactive_database_details=inactive_database_details, ) file.write_text(data=file_contents) sys.stdout.write(f"Created database {file.name}\n") From d473c783d157216c9746174e4b6781bc1b480169 Mon Sep 17 00:00:00 2001 From: Adam Dangoor Date: Tue, 17 Feb 2026 08:25:23 +0000 Subject: [PATCH 2/2] Use DatabaseDict for inactive details --- admin/create_secrets_files.py | 32 ++++++++++++-------------------- 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/admin/create_secrets_files.py b/admin/create_secrets_files.py index 2f70a3bb8..a5c68238a 100644 --- a/admin/create_secrets_files.py +++ b/admin/create_secrets_files.py @@ -86,7 +86,7 @@ def _create_and_get_vumark_details( def _generate_secrets_file_content( database_details: "DatabaseDict", vumark_details: "VuMarkDatabaseDict", - inactive_database_details: dict[str, str], + inactive_database_details: "DatabaseDict", ) -> str: """Generate the content of a secrets file.""" return textwrap.dedent( @@ -97,11 +97,11 @@ def _generate_secrets_file_content( VUFORIA_CLIENT_ACCESS_KEY={database_details["client_access_key"]} VUFORIA_CLIENT_SECRET_KEY={database_details["client_secret_key"]} - INACTIVE_VUFORIA_TARGET_MANAGER_DATABASE_NAME={inactive_database_details["INACTIVE_VUFORIA_TARGET_MANAGER_DATABASE_NAME"]} - INACTIVE_VUFORIA_SERVER_ACCESS_KEY={inactive_database_details["INACTIVE_VUFORIA_SERVER_ACCESS_KEY"]} - INACTIVE_VUFORIA_SERVER_SECRET_KEY={inactive_database_details["INACTIVE_VUFORIA_SERVER_SECRET_KEY"]} - INACTIVE_VUFORIA_CLIENT_ACCESS_KEY={inactive_database_details["INACTIVE_VUFORIA_CLIENT_ACCESS_KEY"]} - INACTIVE_VUFORIA_CLIENT_SECRET_KEY={inactive_database_details["INACTIVE_VUFORIA_CLIENT_SECRET_KEY"]} + INACTIVE_VUFORIA_TARGET_MANAGER_DATABASE_NAME={inactive_database_details["database_name"]} + INACTIVE_VUFORIA_SERVER_ACCESS_KEY={inactive_database_details["server_access_key"]} + INACTIVE_VUFORIA_SERVER_SECRET_KEY={inactive_database_details["server_secret_key"]} + INACTIVE_VUFORIA_CLIENT_ACCESS_KEY={inactive_database_details["client_access_key"]} + INACTIVE_VUFORIA_CLIENT_SECRET_KEY={inactive_database_details["client_secret_key"]} VUMARK_VUFORIA_TARGET_MANAGER_DATABASE_NAME={vumark_details["database_name"]} VUMARK_VUFORIA_SERVER_ACCESS_KEY={vumark_details["server_access_key"]} @@ -122,22 +122,14 @@ def main() -> None: msg = f"Existing secrets file does not exist: {existing_secrets_file}" raise FileNotFoundError(msg) load_dotenv(dotenv_path=existing_secrets_file) - inactive_database_details = { - "INACTIVE_VUFORIA_TARGET_MANAGER_DATABASE_NAME": os.environ[ + inactive_database_details: DatabaseDict = { + "database_name": os.environ[ "INACTIVE_VUFORIA_TARGET_MANAGER_DATABASE_NAME" ], - "INACTIVE_VUFORIA_SERVER_ACCESS_KEY": os.environ[ - "INACTIVE_VUFORIA_SERVER_ACCESS_KEY" - ], - "INACTIVE_VUFORIA_SERVER_SECRET_KEY": os.environ[ - "INACTIVE_VUFORIA_SERVER_SECRET_KEY" - ], - "INACTIVE_VUFORIA_CLIENT_ACCESS_KEY": os.environ[ - "INACTIVE_VUFORIA_CLIENT_ACCESS_KEY" - ], - "INACTIVE_VUFORIA_CLIENT_SECRET_KEY": os.environ[ - "INACTIVE_VUFORIA_CLIENT_SECRET_KEY" - ], + "server_access_key": os.environ["INACTIVE_VUFORIA_SERVER_ACCESS_KEY"], + "server_secret_key": os.environ["INACTIVE_VUFORIA_SERVER_SECRET_KEY"], + "client_access_key": os.environ["INACTIVE_VUFORIA_CLIENT_ACCESS_KEY"], + "client_secret_key": os.environ["INACTIVE_VUFORIA_CLIENT_SECRET_KEY"], } new_secrets_dir.mkdir(exist_ok=True)