Skip to content

chore: add confluence values to tiltfile #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Mar 17, 2025
17 changes: 14 additions & 3 deletions Tiltfile
Original file line number Diff line number Diff line change
Expand Up @@ -339,11 +339,22 @@ 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.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.append("adminBackend.envs.confluenceLoader.CONFLUENCE_DOCUMENT_NAME=%s" % document_names)
value_override.extend(confluence_settings)

if os.environ.get("STACKIT_VLLM_API_KEY", False):
Expand Down
2 changes: 1 addition & 1 deletion rag-core-library
Submodule rag-core-library updated 26 files
+21 −12 admin-api-lib/pyproject.toml
+1 −1 admin-api-lib/src/admin_api_lib/dependency_container.py
+17 −0 admin-api-lib/src/admin_api_lib/extractor_api_client/openapi_client/models/confluence_parameters.py
+63 −31 admin-api-lib/src/admin_api_lib/impl/api_endpoints/default_confluence_loader.py
+8 −2 admin-api-lib/src/admin_api_lib/impl/information_enhancer/page_summary_enhancer.py
+3 −1 admin-api-lib/src/admin_api_lib/impl/information_enhancer/summary_enhancer.py
+0 −1 admin-api-lib/src/admin_api_lib/impl/key_db/file_status_key_value_store.py
+9 −8 admin-api-lib/src/admin_api_lib/impl/mapper/confluence_settings_mapper.py
+154 −18 admin-api-lib/src/admin_api_lib/impl/settings/confluence_settings.py
+0 −0 admin-api-lib/src/admin_api_lib/impl/utils/__init__.py
+66 −0 admin-api-lib/src/admin_api_lib/impl/utils/comma_separated_bool_list.py
+74 −0 admin-api-lib/src/admin_api_lib/impl/utils/comma_separated_str_list.py
+55 −0 admin-api-lib/tests/comma_separated_bool_list_test.py
+49 −0 admin-api-lib/tests/comma_separated_str_list_test.py
+0 −7 admin-api-lib/tests/dummy_test.py
+0 −0 admin-api-lib/tests/settings/__init__.py
+108 −0 admin-api-lib/tests/settings/confluence_settings_test.py
+3 −1 api-generator.sh
+6 −0 extractor-api-lib/openapi.yaml
+16 −10 extractor-api-lib/pyproject.toml
+6 −0 extractor-api-lib/src/extractor_api_lib/impl/api_endpoints/default_confluence_extractor.py
+37 −45 extractor-api-lib/src/extractor_api_lib/models/confluence_parameters.py
+1 −1 rag-core-api/pyproject.toml
+0 −9 rag-core-api/src/rag_core_api/prompt_templates/question_evaluation_on_harmfulness_prompt.py
+1 −1 rag-core-api/src/rag_core_api/prompt_templates/question_rephrasing_prompt.py
+3 −1 rag-core-lib/pyproject.toml
2 changes: 1 addition & 1 deletion rag-infrastructure
Loading