dolphinium commited on
Commit
f3249d4
·
1 Parent(s): c13e67b

solr url fix.

Browse files
Files changed (1) hide show
  1. data_processing.py +13 -4
data_processing.py CHANGED
@@ -21,6 +21,7 @@ import copy
21
  import google.generativeai as genai
22
  import urllib
23
  import pysolr
 
24
 
25
  from llm_prompts import (
26
  get_analysis_plan_prompt,
@@ -100,9 +101,13 @@ def execute_quantitative_query(solr_client, plan):
100
  base_url = f"{solr_client.url}/select"
101
  query_string = urllib.parse.urlencode(params)
102
  full_url = f"{base_url}?{query_string}"
103
- print(f"[DEBUG] Solr QUANTITATIVE query URL: {full_url}")
 
 
 
 
104
  results = solr_client.search(**params)
105
- return results.raw_response.get("facets", {}), full_url
106
  except pysolr.SolrError as e:
107
  print(f"Solr Error in quantitative query on core {solr_client.url}: {e}")
108
  return None, None
@@ -126,9 +131,13 @@ def execute_qualitative_query(solr_client, plan):
126
  base_url = f"{solr_client.url}/select"
127
  query_string = urllib.parse.urlencode(params)
128
  full_url = f"{base_url}?{query_string}"
129
- print(f"[DEBUG] Solr QUALITATIVE query URL: {full_url}")
 
 
 
 
130
  results = solr_client.search(**params)
131
- return results.grouped, full_url
132
  except pysolr.SolrError as e:
133
  print(f"Solr Error in qualitative query on core {solr_client.url}: {e}")
134
  return None, None
 
21
  import google.generativeai as genai
22
  import urllib
23
  import pysolr
24
+ import config # Import the config module to access remote host details
25
 
26
  from llm_prompts import (
27
  get_analysis_plan_prompt,
 
101
  base_url = f"{solr_client.url}/select"
102
  query_string = urllib.parse.urlencode(params)
103
  full_url = f"{base_url}?{query_string}"
104
+ print(f"[DEBUG] Solr QUANTITATIVE query URL (local): {full_url}")
105
+
106
+ # Create the public-facing URL for display
107
+ public_url = full_url.replace(f'http://127.0.0.1:{config.LOCAL_BIND_PORT}', f'http://{config.REMOTE_SOLR_HOST}:{config.REMOTE_SOLR_PORT}')
108
+
109
  results = solr_client.search(**params)
110
+ return results.raw_response.get("facets", {}), public_url
111
  except pysolr.SolrError as e:
112
  print(f"Solr Error in quantitative query on core {solr_client.url}: {e}")
113
  return None, None
 
131
  base_url = f"{solr_client.url}/select"
132
  query_string = urllib.parse.urlencode(params)
133
  full_url = f"{base_url}?{query_string}"
134
+ print(f"[DEBUG] Solr QUALITATIVE query URL (local): {full_url}")
135
+
136
+ # Create the public-facing URL for display
137
+ public_url = full_url.replace(f'http://127.0.0.1:{config.LOCAL_BIND_PORT}', f'http://{config.REMOTE_SOLR_HOST}:{config.REMOTE_SOLR_PORT}')
138
+
139
  results = solr_client.search(**params)
140
+ return results.grouped, public_url
141
  except pysolr.SolrError as e:
142
  print(f"Solr Error in qualitative query on core {solr_client.url}: {e}")
143
  return None, None