Skip to content

Commit 9139328

Browse files
committed
use index from config in sql query
1 parent de75ee5 commit 9139328

File tree

1 file changed

+14
-6
lines changed

1 file changed

+14
-6
lines changed

sde_collections/sinequa_api.py

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,31 +17,37 @@
1717
"app_name": "nasa-sba-smd",
1818
"query_name": "query-smd-primary",
1919
"base_url": "https://sciencediscoveryengine.test.nasa.gov",
20+
"index": "sde_index",
2021
},
2122
"production": {
2223
"app_name": "nasa-sba-smd",
2324
"query_name": "query-smd-primary",
2425
"base_url": "https://sciencediscoveryengine.nasa.gov",
26+
"index": "sde_index",
2527
},
2628
"secret_test": {
2729
"app_name": "nasa-sba-sde",
2830
"query_name": "query-sde-primary",
2931
"base_url": "https://sciencediscoveryengine.test.nasa.gov",
32+
"index": "sde_index",
3033
},
3134
"secret_production": {
3235
"app_name": "nasa-sba-sde",
3336
"query_name": "query-sde-primary",
3437
"base_url": "https://sciencediscoveryengine.nasa.gov",
38+
"index": "sde_index",
3539
},
3640
"xli": {
3741
"app_name": "nasa-sba-smd",
3842
"query_name": "query-smd-primary",
3943
"base_url": "http://sde-xli.nasa-impact.net",
44+
"index": "sde_index",
4045
},
4146
"lrm_dev": {
4247
"app_name": "sde-init-check",
4348
"query_name": "query-init-check",
4449
"base_url": "https://sde-lrm.nasa-impact.net",
50+
"index": "sde_init_check",
4551
},
4652
"lrm_qa": {
4753
"app_name": "sde-init-check",
@@ -57,10 +63,10 @@ def __init__(self, server_name: str = None, user: str = None, password: str = No
5763
if server_name not in server_configs:
5864
raise ValueError(f"Server name '{server_name}' is not in server_configs")
5965

60-
config = server_configs[server_name]
61-
self.app_name: str = config["app_name"]
62-
self.query_name: str = config["query_name"]
63-
self.base_url: str = config["base_url"]
66+
self.config = server_configs[server_name]
67+
self.app_name: str = self.config["app_name"]
68+
self.query_name: str = self.config["query_name"]
69+
self.base_url: str = self.config["base_url"]
6470
self.dev_servers = ["xli", "lrm_dev", "lrm_qa"]
6571

6672
# Store provided values only
@@ -130,7 +136,6 @@ def sql_query(self, sql: str) -> Any:
130136
token = self._get_token()
131137
if not token:
132138
raise ValueError("A token is required to use the SQL endpoint")
133-
134139
url = f"{self.base_url}/api/v1/engine.sql"
135140
headers = {"Content-Type": "application/json", "Authorization": f"Bearer {token}"}
136141
payload = json.dumps(
@@ -182,5 +187,8 @@ def get_full_texts(self, collection_config_folder: str, source: str = None) -> A
182187
if not source:
183188
source = self._get_source_name()
184189

185-
sql = f"SELECT url1, text, title FROM sde_index WHERE collection = '/{source}/{collection_config_folder}/'"
190+
if (index := self.config.get("index")) is None:
191+
raise ValueError("Index not defined for this server")
192+
193+
sql = f"SELECT url1, text, title FROM {index} WHERE collection = '/{source}/{collection_config_folder}/'"
186194
return self.sql_query(sql)

0 commit comments

Comments
 (0)