From 708ec2dcf308685d10c55995ec45518e236f7d23 Mon Sep 17 00:00:00 2001 From: Andreas Klos Date: Wed, 12 Mar 2025 08:11:37 +0100 Subject: [PATCH 1/6] feat: enhance Confluence configuration handling and add optional settings --- Tiltfile | 21 ++++++++++++++++++--- rag-core-library | 2 +- rag-infrastructure | 2 +- 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/Tiltfile b/Tiltfile index a5e62be..53fd008 100644 --- a/Tiltfile +++ b/Tiltfile @@ -339,11 +339,26 @@ def has_confluence_config(): return True if has_confluence_config(): + token = os.environ["CONFLUENCE_TOKEN"].replace(",", "\\,") + url = os.environ["CONFLUENCE_URL"].replace(",", "\\,") + space_key = os.environ["CONFLUENCE_SPACE_KEY"].replace(",", "\\,") + confluence_settings = [ - "adminBackend.secrets.confluenceLoader.token=%s" % os.environ["CONFLUENCE_TOKEN"], - "adminBackend.envs.confluenceLoader.CONFLUENCE_URL=%s" % os.environ["CONFLUENCE_URL"], - "adminBackend.envs.confluenceLoader.CONFLUENCE_SPACE_KEY=%s" % os.environ["CONFLUENCE_SPACE_KEY"], + "adminBackend.secrets.confluenceLoader.token=%s" % token, + "adminBackend.envs.confluenceLoader.CONFLUENCE_URL=%s" % url, + "adminBackend.envs.confluenceLoader.CONFLUENCE_SPACE_KEY=%s" % space_key, ] + + if os.environ.get("CONFLUENCE_VERIFY_SSL"): + verify_ssl = os.environ["CONFLUENCE_VERIFY_SSL"].replace(",", "\\,") + confluence_settings += [ + "adminBackend.envs.confluenceLoader.CONFLUENCE_VERIFY_SSL=%s" % verify_ssl, + ] + if os.environ.get("CONFLUENCE_DOCUMENT_NAME"): + document_names = os.environ["CONFLUENCE_DOCUMENT_NAME"].replace(",", "\\,") + confluence_settings += [ + "adminBackend.envs.confluenceLoader.CONFLUENCE_DOCUMENT_NAME=%s" % document_names, + ] value_override.extend(confluence_settings) if os.environ.get("STACKIT_VLLM_API_KEY", False): diff --git a/rag-core-library b/rag-core-library index 5c16ffe..f77c144 160000 --- a/rag-core-library +++ b/rag-core-library @@ -1 +1 @@ -Subproject commit 5c16ffe9caca6787b5e94a09a0aec9b902aba735 +Subproject commit f77c1449b3284c131d1ff59d71fc90aff795e9ab diff --git a/rag-infrastructure b/rag-infrastructure index c4d81eb..7e94629 160000 --- a/rag-infrastructure +++ b/rag-infrastructure @@ -1 +1 @@ -Subproject commit c4d81eb9f7ffe084afacc7dca408d4fc196fafe2 +Subproject commit 7e946296d98cb29b34abb863990ac7cbbd48f993 From 8ab8378cea0701d5c1a453b2eabdf4c52f7692c8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 12 Mar 2025 07:13:09 +0000 Subject: [PATCH 2/6] chore: update submodules to latest main --- rag-core-library | 2 +- rag-infrastructure | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rag-core-library b/rag-core-library index f77c144..a55f762 160000 --- a/rag-core-library +++ b/rag-core-library @@ -1 +1 @@ -Subproject commit f77c1449b3284c131d1ff59d71fc90aff795e9ab +Subproject commit a55f76220674e01703ffa07753739d141fb622dc diff --git a/rag-infrastructure b/rag-infrastructure index 7e94629..5c87df6 160000 --- a/rag-infrastructure +++ b/rag-infrastructure @@ -1 +1 @@ -Subproject commit 7e946296d98cb29b34abb863990ac7cbbd48f993 +Subproject commit 5c87df6e5a7a1d5ae249dc47d2f6392e684fa3ae From b7a1f3e23983e07d253bb2af3237bd1c5bc0d462 Mon Sep 17 00:00:00 2001 From: Andreas Klos Date: Thu, 13 Mar 2025 08:10:59 +0100 Subject: [PATCH 3/6] chore: update Confluence settings handling --- Tiltfile | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Tiltfile b/Tiltfile index 53fd008..229eb45 100644 --- a/Tiltfile +++ b/Tiltfile @@ -351,14 +351,10 @@ if has_confluence_config(): if os.environ.get("CONFLUENCE_VERIFY_SSL"): verify_ssl = os.environ["CONFLUENCE_VERIFY_SSL"].replace(",", "\\,") - confluence_settings += [ - "adminBackend.envs.confluenceLoader.CONFLUENCE_VERIFY_SSL=%s" % verify_ssl, - ] + confluence_settings.append("adminBackend.envs.confluenceLoader.CONFLUENCE_VERIFY_SSL=%s" % verify_ssl) if os.environ.get("CONFLUENCE_DOCUMENT_NAME"): document_names = os.environ["CONFLUENCE_DOCUMENT_NAME"].replace(",", "\\,") - confluence_settings += [ - "adminBackend.envs.confluenceLoader.CONFLUENCE_DOCUMENT_NAME=%s" % document_names, - ] + confluence_settings.append("adminBackend.envs.confluenceLoader.CONFLUENCE_DOCUMENT_NAME=%s" % document_names) value_override.extend(confluence_settings) if os.environ.get("STACKIT_VLLM_API_KEY", False): From a51bfd364b588e08962a5a4c6f9801b3e0610052 Mon Sep 17 00:00:00 2001 From: Andreas Klos Date: Thu, 13 Mar 2025 08:11:28 +0100 Subject: [PATCH 4/6] chore: update subproject commit reference in rag-core-library --- rag-core-library | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rag-core-library b/rag-core-library index f77c144..80e6179 160000 --- a/rag-core-library +++ b/rag-core-library @@ -1 +1 @@ -Subproject commit f77c1449b3284c131d1ff59d71fc90aff795e9ab +Subproject commit 80e6179a5e165dfaa16f13609bd47343cb0a514c From aefdb16a8e4b08a104e084aabc67ecdfd138ed4c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 13 Mar 2025 07:12:37 +0000 Subject: [PATCH 5/6] chore: update submodules to latest main --- rag-core-library | 2 +- rag-infrastructure | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rag-core-library b/rag-core-library index 80e6179..a55f762 160000 --- a/rag-core-library +++ b/rag-core-library @@ -1 +1 @@ -Subproject commit 80e6179a5e165dfaa16f13609bd47343cb0a514c +Subproject commit a55f76220674e01703ffa07753739d141fb622dc diff --git a/rag-infrastructure b/rag-infrastructure index 7e94629..5c87df6 160000 --- a/rag-infrastructure +++ b/rag-infrastructure @@ -1 +1 @@ -Subproject commit 7e946296d98cb29b34abb863990ac7cbbd48f993 +Subproject commit 5c87df6e5a7a1d5ae249dc47d2f6392e684fa3ae From 1d978498fc4bcddf64a2cefd6916c74bf421e2a4 Mon Sep 17 00:00:00 2001 From: Andreas Klos Date: Mon, 17 Mar 2025 10:58:15 +0100 Subject: [PATCH 6/6] chore: update subproject commit references in rag-core-library and rag-infrastructure --- rag-core-library | 2 +- rag-infrastructure | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rag-core-library b/rag-core-library index 80e6179..5f3884d 160000 --- a/rag-core-library +++ b/rag-core-library @@ -1 +1 @@ -Subproject commit 80e6179a5e165dfaa16f13609bd47343cb0a514c +Subproject commit 5f3884dc63e19ee7e15ce1f72e45f6d98ceb5e49 diff --git a/rag-infrastructure b/rag-infrastructure index 7e94629..e01bf89 160000 --- a/rag-infrastructure +++ b/rag-infrastructure @@ -1 +1 @@ -Subproject commit 7e946296d98cb29b34abb863990ac7cbbd48f993 +Subproject commit e01bf8974baca6735374222b68ca7b67d02f3f68