fixing google creads

.env

@@ -1,15 +1,17 @@
+# Whatsapp
 WP_API_VERSION      = v22.0
 WP_PHONE_NUMBER_ID  = 863534053506517
 WP_ACCESS_TOKEN     = EAAU3mUZAngvIBPsTXo8LPFZByy2gurt7dDZCz38tAPpvZC27FqdCKAnfewlM5xUhzDmWWyDkfM6zBbE3EZCNIQvWwDW5y38n13Jn2ad4qfKALodh9w7whB4kGePQSUclukIKpEUzBgdtui5m3ovLAmSSZCE5ZB2gaCFTcahjv0qaTiQJzVFZAAldyDh8ahgYO9o2KGpGtOoBtevB1s39cbKgwCXBRsuwuK1IQ7SDuDmoMpMrVgZDZD
 WP_WEBHOOK_TOKEN    = MylovelyToken
-
-WP_CHAT_HISTORY_FIELD           = Chat_History 
-WP_MESSAGE_ID_FIELD             = Wp_Message_Id
 WP_INTRODUCTION_GAP_SEC         = 10
+
+# Google
+WP_CHAT_HISTORY_FIELD           = Chat_History   
+WP_MESSAGE_ID_FIELD             = Wp_Message_Id 
 GOOGLE_SHEETS_PHONENUMBER_FIELD = Phone_number
 GOOGLE_SHEETS_NAME_FIELD        = Name
 GOOGLE_SHEETS_TIME_STAMP_FIELD  = Time_Stamp
 GOOGLE_SHEETS_STATUS_FIELD      = Status
 
-
+# Genai
 GENAI_TOKEN = AIzaSyCRLz_0GWCx0aFaJnL4dmPiANOeQt4t3eE

.gitignore

@@ -1 +1,2 @@
-*.ipynb
+*.ipynb
+*.env

Dockerfile

@@ -1,6 +1,7 @@
 # Use the official Python 3.10.9 image
 FROM python:3.11.5
 
+
 # Copy the current directory contents into the container at .
 COPY . .
 
@@ -10,10 +11,6 @@ WORKDIR /
 # Install requirements.txt 
 RUN pip install --no-cache-dir -r /requirements.txt
 
-# copy test + entrypoint
-COPY test_dns.py /test_dns.py
-COPY entrypoint.sh /entrypoint.sh
-RUN chmod +x /entrypoint.sh
 
-EXPOSE 7860
-CMD ["/entrypoint.sh"]
+# Start the FastAPI app on port 7860, the default port expected by Spaces
+CMD ["uvicorn", "router:app", "--host", "0.0.0.0", "--port", "7860"]

entrypoint.sh

@@ -1,4 +0,0 @@
-#!/bin/sh
-set -e
-python /test_dns.py || true   # run DNS test (won't crash the container)
-exec uvicorn router:app --host 0.0.0.0 --port 7860

gServiceAccountCredintial.json

@@ -10,4 +10,4 @@
   "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
   "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/google-sheets-api%40gen-lang-client-0361809228.iam.gserviceaccount.com",
   "universe_domain": "googleapis.com"
-}
+}

runtime.yaml

@@ -1,5 +0,0 @@
-sdk: docker
-app_port: 7860
-docker:
-  build_args:
-    DNS_SERVERS: "8.8.8.8,1.1.1.1"

test_dns.py

@@ -1,20 +0,0 @@
-# test_dns.py
-import socket, sys, requests, traceback
-
-def test(host):
-    print("=== TEST", host, "===")
-    try:
-        print("getaddrinfo:", socket.getaddrinfo(host, 443))
-    except Exception as e:
-        print("RESOLVE ERROR:", repr(e))
-    try:
-        r = requests.get(f"https://{host}", timeout=7)
-        print("HTTP status:", r.status_code)
-    except Exception as e:
-        print("HTTP ERROR:", repr(e))
-    print()
-
-if __name__ == "__main__":
-    for h in ("graph.facebook.com","www.googleapis.com"):
-        test(h)
-    sys.exit(0)

utils.py

@@ -182,8 +182,20 @@ class GoogleSheets:
     def get_sheet(self, sheet_name, work_sheet):
         try:
             # Authenticate and create a client
-            creds = Credentials.from_service_account_file(
-                self.SERVICE_ACCOUNT_FILE, 
+            creds = Credentials.from_service_account_info(
+                {
+                    "type": "service_account",
+                    "project_id": "gen-lang-client-0361809228",
+                    "private_key_id": "35bf4e5c18c0cc67c69b6f0779a732c0635689bc",
+                    "private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDQuXFA5k6Y5YhL\nW7jnw2d5rjOKzQ156X225dc8BlPvcUN3KdinxT/uBztynej/TmCecG2ZB+/nqf09\nBh5vxRRFXH1zIqEgtFZdTtDUcvBEkqAgk20pXlAGaHXG76hoHFEv1A/qKUWLZsbe\npJ7oFt+JcGwwFa1dVgmK49Y5uEIiS51svYtKgZfiuJwUm4O/6e2pyy2a1XbXO77N\nicGfv8QUWVv6kW3CG3r5Pt6ay1YKeBIYEYvHMuneKLzTIs8g1F8C7c6Eyh9glB/C\niKpfcoNA467Q1eUTmWkZNjLrwH0CerUMCBYsfxynP5gTBHZCDtmtNtZxw2gqvp6v\n7VM/2QIrAgMBAAECggEABA78YcZYqZEaWQTGj/3KXvZWhZC+fgFenWt+B5UZQA2p\nbIFsIg8BfY+3GzUbg7iyw5dCD6NfiddSAkQX3BUung6nWHwdj/TnEldm/h/iBiNS\naRpqGU9+f4a7y4t7cH15zVPyn0YAK9lqwoeG7ie2XwYdmcMXejojDgf8xrs2Jf6I\ntifxghHjIYaL6Ubz2Z9OdsIJ8M3LRBzj/5+h8t4JIUOKZ95VYEqBBSVL/qKQWJw1\n4SQ+s8A8JdoA48TWYOCwVNDOfLSUODselrKR+hdNgidqhotUh2wItUksLghVdnxh\nnLcT+cfSLs8ibuPkAqQNrVPw+unjgc0WMkfmT5rGIQKBgQD9rEDtnZTt7W/XgYPG\nr/y+bzPqMQTYnNQaql6eDRir+3uXg3uuwjbId++kONbryJXqppa/P4MhVJSAFwkf\nCfWrxe3RmAzZLyRp6PHjavJAbW9d0lx3vPfd406ti1nB5llofrzphH3wERos4wtc\nSEX4EMT5F8WS0LfRSJid92zQewKBgQDSo6DGycXrOzEKyY+k1wsZhRY4D6s9FVe/\nn3WNz1MOU8sEZlRf2nwsHRGpJz/0CFE26HK6UR/VPjcTmSIpnh816nlDqzxzxCbB\nvTtN0eRRQ+aNiWKC0P5UGkXHS0WNNZt8rdU/Xg0Z2BupDm0rJTsfm/xZdpxzlLNv\nC7S/j5ZeEQKBgDELn9YRNJ033frduJuupQAwwenSpmw3Di9Fp1uJjq6ZxdCKhFxK\ngosJ3VR0BOG7e3jN0rGRVwoXr0qAqavNoike8Jcofbt0COdNOY9Nux7HydNq+6PO\n7mGBNFILckQyBDFW57GCg1LqC5SIJUcnVhfbLio29WUoY5HcJl3MW8aHAoGAK/9D\noOIadiT5/G/Xki3cwqra1kDnmq2vk3YCPum0RoTYHgYlz5O6Zhh4TOXG5PkrxZVO\nCX7ScF87b9uHmDvP9xoP1EObL+8jzUnybjHOR+8v5BZzPjHbPcPzGUqur20oGiXR\nKhhCEkjiljBOOznenJ6fWix9R2MjC6ndSjn6xZECgYEAzi8zgfN+e7xTSH0dmyZf\nIoXIZfesm6uYeaSpBaR+kpopXTsyfAw1d0RLeBa6NZe+h657b/e25Qat/1A+BchN\ntGeZJqZt5sUlTkOBpCn5oywEtmj7WfwrEa68i5G0TeNqL4UImhB8cfwnNOVzzJmQ\nmZMn0y/YtashCq8ajavSoMo=\n-----END PRIVATE KEY-----\n",
+                    "client_email": "google-sheets-api@gen-lang-client-0361809228.iam.gserviceaccount.com",
+                    "client_id": "112907416973756329799",
+                    "auth_uri": "https://accounts.google.com/o/oauth2/auth",
+                    "token_uri": "https://oauth2.googleapis.com/token",
+                    "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
+                    "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/google-sheets-api%40gen-lang-client-0361809228.iam.gserviceaccount.com",
+                    "universe_domain": "googleapis.com"
+                }, 
                 scopes=self.SCOPES
             )
             client = gspread.authorize(creds)