ak0601 commited on
Commit
0977b5d
·
verified ·
1 Parent(s): 21295c9

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +5 -14
app.py CHANGED
@@ -19,26 +19,17 @@ import datetime
19
 
20
  # === CONFIGURE ENV AND AUTH ===
21
  load_dotenv()
22
- service_account_path = {
23
- "type": os.getenv("type"),
24
- "project_id": os.getenv("project_id"),
25
- "private_key_id": str(os.getenv("private_key_id")).replace('\\n', '\n'),
26
- "private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCvdOCE3Y7cuRJF\neVevJBmFm7p6irtlqhAVnUED7zq/RXKO2VV7VqUCfDaANTGQy2jmlVGhFA3q1GM6\nWDpcvFRzsYSpHtwr+REvDw5xmFMTA7Z6jVTXt1oDTJyLk3KznmSZR/5LnhQAYXmw\nay6fhYFW8AMHybgNB5gKwWxBoZrP142w2/k3F0muduriBNt7nAVKF3xG1KPoy1eC\nwyU+jM/9ZNyYO7MFNIbwjqkhHpENfWIO+Lw5TF7hrNIlz4sJBTbM1FB61czQb4fw\nyDIvQB2xkCSIm+yTIWMGpIZirNgsh+SE0S0kc7oBQ7pwQN7RFWAOj4lBNYqrJJRo\ny2hxfiOvAgMBAAECggEABMOcKw9nByhBTkCeuGM3DDEvzY8Byp9lA2k7MDOpOTNW\nCnntP8WZAmnEAxQurdtQFF6+kiycuiEdNqLZptX4RxHtY7gyS0FejZQPlNcJfm0t\n4cL/qEHSwF8uqv2MckMdQSo6xevbaC09ZCRs5ij2W5l1w5rfE/9+SeB5o4iTTwxk\nSFnXVHeb26+YsEujf8r8CRkyflTofwVMzkjYCJvdyo09pJvTjxFw+oDyba7/dNhZ\nx6sPaI9hOmh+5DFdIkZUxVEE/xyXoz8du+SgBJk+/fCCpgArW42MqF+lb2GwFFqP\nLu/IGB9UamW7y+Mvm8ie+rowov/rZI1gN5k4ZJVhfQKBgQDcak4xYY+2WR1KLS9K\nxiJWUtZwt5jyWC6RyJ7h3jxJ5y//d3xWeBzx3Odh28KwaOEtX4eOTSt1b+oBGqWM\nvtEodL6lD2S+5IGRAq5tJDfgTBUEX/boMVAEt5QaGzklvz31eixe0hO1Tg2s1/l8\nmJPcV0LppOVbMGhwf7FukgK7pQKBgQDLyHEywAf/CuikrZgYKdxlg1dCJoRLyzFn\nxiHqZ7zdfm3N+OcK/1FDhATxAfiFh6Zm49STeH69T0Ywrw54DEbAWbKBLX8wU9UU\nWSc7xJMNZGbUIHiDPDYvNJ87bzYzwGuXgMImKZn9HVvcTh8IBkP561o85Rk/BTvr\n89P9NcJRwwKBgQCIO+CGnxGPmHcFEPaJFfvFNUA7vQ74w05NZx3k51KGLzG4iea9\nH1Jsn6gYERe9p6V+QOxtJP92f6y37/thCdQHWFk5dlFDt8LpmSmsZdVvejcHVDUt\nAMW/lKQimq7wyMqH/nKMTPZHeq3zJi6bN0c0ym6eMQBeI4Z5+kL136N2zQKBgGhY\nrM4F0pJf7ZxVX2oQFVDNniK7QkblNtkidT9n+yeXk3ZCm1vgPKZLtZQLJEyLl0Nc\nKf+RVaRuMUzAdrI15wybYXIP7+65HoSa2iIamAnlfVnlfpAEhuJJGbf/TEvXncAo\nKEIOT1FydRUr02vyeWBBiSVhUjoY3gQGCGjB3EytAoGACDWh1azo61HfUWYbeblK\ngJGTDzCMSahI1Upv+nag1EGD5rhxLcEv3Bbk5DPXcjK+2oHcFOTudJVJP8ca9X96\nZIzeHqFGJqDVRE/jtVzqxu7WH6H2qhTlGdRkTZCux8eKoBp3pgWyRO+2PG3iATsJ\nwEOe8eiS9Da/+L/6qlv//nA=\n-----END PRIVATE KEY-----\n",
27
- "client_email": os.getenv("client_email"),
28
- "client_id": os.getenv("client_id"),
29
- "auth_uri": os.getenv("auth_uri"),
30
- "token_uri": os.getenv("token_uri"),
31
- "auth_provider_x509_cert_url": os.getenv("auth_provider_x509_cert_url"),
32
- "client_x509_cert_url": os.getenv("client_x509_cert_url"),
33
- "universe_domain":os.getenv("universe_domain")
34
- }
35
  hf_token = os.getenv("HUGGINGFACE_TOKEN")
36
  assert hf_token, "Please set HUGGINGFACE_TOKEN in your .env"
37
  login(token=hf_token)
38
  assert os.getenv("GOOGLE_API_KEY"), "Set GOOGLE_API_KEY in .env"
39
  assert os.getenv("TAVILY_API_KEY"), "Set TAVILY_API_KEY in .env"
40
  genai.configure(api_key=os.getenv("GOOGLE_API_KEY"))
 
 
41
 
 
42
  def flatten_json(obj: dict) -> str:
43
  pieces = []
44
  def recurse(prefix, value):
@@ -80,7 +71,7 @@ vector_store = load_vector_store('College_markdown')
80
  SHEET_KEY = os.getenv("SHEET_KEY")
81
 
82
  def add_query_to_sheet(user_id, query, response):
83
- gc = gspread.service_account_from_dict(service_account_path)
84
  sh = gc.open_by_key(SHEET_KEY)
85
  worksheet = sh.worksheet("Sheet1")
86
 
 
19
 
20
  # === CONFIGURE ENV AND AUTH ===
21
  load_dotenv()
22
+
 
 
 
 
 
 
 
 
 
 
 
 
23
  hf_token = os.getenv("HUGGINGFACE_TOKEN")
24
  assert hf_token, "Please set HUGGINGFACE_TOKEN in your .env"
25
  login(token=hf_token)
26
  assert os.getenv("GOOGLE_API_KEY"), "Set GOOGLE_API_KEY in .env"
27
  assert os.getenv("TAVILY_API_KEY"), "Set TAVILY_API_KEY in .env"
28
  genai.configure(api_key=os.getenv("GOOGLE_API_KEY"))
29
+ service_account_info = os.getenv("GOOGLE_SERVICE_ACCOUNT_JSON")
30
+ assert service_account_info, "Missing GOOGLE_SERVICE_ACCOUNT_JSON secret!"
31
 
32
+ service_account_dict = json.loads(service_account_info)
33
  def flatten_json(obj: dict) -> str:
34
  pieces = []
35
  def recurse(prefix, value):
 
71
  SHEET_KEY = os.getenv("SHEET_KEY")
72
 
73
  def add_query_to_sheet(user_id, query, response):
74
+ gc = gspread.service_account_from_dict(service_account_dict)
75
  sh = gc.open_by_key(SHEET_KEY)
76
  worksheet = sh.worksheet("Sheet1")
77