manage json secret

config.py

@@ -29,59 +29,44 @@ print("DEBUG: Handling BigQuery credentials...")
 if os.environ.get("BIGQUERY_KEY_PATH"):
     bigquery_key = os.environ.get("BIGQUERY_KEY_PATH")
     print(f"DEBUG: BIGQUERY_KEY_PATH is set, length: {len(bigquery_key)} characters")
-    print(f"DEBUG: First 20 chars: {bigquery_key[:20]}...")
     
-    # If BIGQUERY_KEY_PATH contains the actual JSON content (as in HF Spaces secrets)
-    if bigquery_key.strip().startswith("{"):
-        print("DEBUG: BIGQUERY_KEY_PATH appears to contain JSON content")
-        try:
-            # Validate JSON
-            json_obj = json.loads(bigquery_key)
-            print("DEBUG: Successfully parsed JSON content")
-            
-            # Create a temporary credentials file from the environment variable
-            credentials_path = "/tmp/bigquery_credentials.json"
-            
-            with open(credentials_path, "w") as f:
-                f.write(bigquery_key)
-            
-            print(f"DEBUG: Wrote credentials to {credentials_path}")
-            
-            # Set the credentials path to the temporary file
-            os.environ["GOOGLE_APPLICATION_CREDENTIALS"] = credentials_path
-            print(f"DEBUG: Set GOOGLE_APPLICATION_CREDENTIALS to {credentials_path}")
-            
-            # Verify the file exists
-            if os.path.exists(credentials_path):
-                print(f"DEBUG: Confirmed credentials file exists at {credentials_path}")
+    # Create a temporary credentials file from the environment variable
+    credentials_path = "/tmp/bigquery_credentials.json"
+    
+    try:
+        # Try to directly write the content to a file without JSON parsing
+        with open(credentials_path, "w") as f:
+            f.write(bigquery_key)
+        
+        print(f"DEBUG: Wrote credentials to {credentials_path}")
+        
+
+        os.environ["BIGQUERY_KEY_PATH"] = credentials_path
+        print(f"DEBUG: Set  BIGQUERY_KEY_PATH to {credentials_path}")
+        
+        # Verify the file exists
+        if os.path.exists(credentials_path):
+            print(f"DEBUG: Confirmed credentials file exists at {credentials_path}")
+            # Try to validate the JSON by reading it back
+            try:
                 with open(credentials_path, "r") as f:
-                    first_line = f.readline()
-                    print(f"DEBUG: First line of credentials file: {first_line[:20]}...")
-            else:
-                print(f"ERROR: Failed to create credentials file at {credentials_path}")
-        except json.JSONDecodeError as e:
-            print(f"ERROR: BIGQUERY_KEY_PATH contains invalid JSON: {str(e)}")
-            print("Please ensure your secret contains valid JSON content")
-    # If BIGQUERY_KEY_PATH is a file path
-    elif os.path.exists(bigquery_key):
-        print(f"DEBUG: BIGQUERY_KEY_PATH points to existing file: {bigquery_key}")
-        os.environ["GOOGLE_APPLICATION_CREDENTIALS"] = bigquery_key
-    else:
-        print(f"WARNING: BIGQUERY_KEY_PATH is set but does not contain JSON and is not a valid file path: {bigquery_key}")
+                    json.load(f)
+                print("DEBUG: Credentials file contains valid JSON")
+            except json.JSONDecodeError as e:
+                print(f"WARNING: Credentials file contains invalid JSON: {str(e)}")
+                print("This might cause issues with BigQuery authentication")
+        else:
+            print(f"ERROR: Failed to create credentials file at {credentials_path}")
+    except Exception as e:
+        print(f"ERROR: Failed to process BigQuery credentials: {str(e)}")
 else:
     print("WARNING: BIGQUERY_KEY_PATH environment variable is not set")
 
-# BigQuery configurationo
-BIGQUERY_KEY_PATH = bigquery_key
-PROJECT_ID = os.environ.get("PROJECT_ID")
-DATASET_ID = os.environ.get("DATASET_ID")
 
-# Final check for GOOGLE_APPLICATION_CREDENTIALS
-if os.environ.get("GOOGLE_APPLICATION_CREDENTIALS"):
-    print(f"DEBUG: GOOGLE_APPLICATION_CREDENTIALS is set to: {os.environ.get('GOOGLE_APPLICATION_CREDENTIALS')}")
-    if os.path.exists(os.environ.get("GOOGLE_APPLICATION_CREDENTIALS")):
-        print("DEBUG: GOOGLE_APPLICATION_CREDENTIALS file exists")
-    else:
-        print("ERROR: GOOGLE_APPLICATION_CREDENTIALS file does not exist")
+
+# Final check for credentials
+if os.path.exists(os.environ.get("BIGQUERY_KEY_PATH", "")):
+    print(f"DEBUG: BIGQUERY_KEY_PATH file exists at: {os.environ.get('BIGQUERY_KEY_PATH')}")
 else:
-    print("WARNING: GOOGLE_APPLICATION_CREDENTIALS is not set")
+    print(f"WARNING: BIGQUERY_KEY_PATH file does not exist at: {os.environ.get('BIGQUERY_KEY_PATH')}")
+