Update app.py

app.py

@@ -10,39 +10,53 @@ from google.auth.transport.requests import Request
 from google_auth_oauthlib.flow import InstalledAppFlow
 from googleapiclient.discovery import build
 from googleapiclient.http import MediaIoBaseDownload,MediaFileUpload
-
-# Load credentials from environment variables
-config = {'installed': {'client_id': os.environ.get("client_id"),
-  'project_id': os.environ.get("project_id"),
-  'auth_uri': os.environ.get("auth_uri"),
-  'token_uri': os.environ.get("token_uri"),
-  'auth_provider_x509_cert_url': os.environ.get("auth_provider_x509_cert_url"),
-  'client_secret': os.environ.get("client_secret"),
-  'redirect_uris': ['http://localhost']}}
+from google.oauth2 import service_account
 
 SCOPES = ['https://www.googleapis.com/auth/drive']
 
+# Load credentials from environment variables
+SERVICE_ACCOUNT_INFO = {
+  "type": "service_account",
+  "project_id": os.environ.get("project_id"),
+  "private_key_id": os.environ.get("private_key_id"),
+  "private_key": os.environ.get("private_key"),
+  "client_email": os.environ.get("client_email"),
+  "client_id": os.environ.get("client_id"),
+  "auth_uri": "https://accounts.google.com/o/oauth2/auth",
+  "token_uri": os.environ.get("token_uri"),
+  "auth_provider_x509_cert_url": os.environ.get("auth_provider_x509_cert_url"),
+  "client_x509_cert_url": os.environ.get("client_x509_cert_url"),
+  "universe_domain": "googleapis.com"
+}
+
 def authenticate():
-    creds = None
+    # Authenticate using service account credentials
+    creds = service_account.Credentials.from_service_account_info(SERVICE_ACCOUNT_INFO, scopes=['https://www.googleapis.com/auth/drive'])
+
+    # Build the Drive API service
+    # service = build('drive', 'v3', credentials=creds)
+    return creds
+
+    # creds = service_account.Credentials.from_service_account_file(
+    #     SERVICE_ACCOUNT_FILE, scopes=['https://www.googleapis.com/auth/drive'])
 
     # Check if token file exists
-    if os.path.exists('token.json'):
-        creds = Credentials.from_authorized_user_file('token.json')
+    # if os.path.exists('token.json'):
+    #     creds = Credentials.from_authorized_user_file('token.json')
 
     # If no valid credentials available, ask the user to login
-    if not creds or not creds.valid:
-        if creds and creds.expired and creds.refresh_token:
-            creds.refresh(Request())
-        else:
-            # flow = InstalledAppFlow.from_client_secrets_file("credentials.json", SCOPES)
-            flow = InstalledAppFlow.from_client_config(config,SCOPES)
-            creds = flow.run_local_server(port=0)
+    # if not creds or not creds.valid:
+    #     if creds and creds.expired and creds.refresh_token:
+    #         creds.refresh(Request())
+    #     else:
+    #         # flow = InstalledAppFlow.from_client_secrets_file("credentials.json", SCOPES)
+    #         flow = InstalledAppFlow.from_client_config(config,SCOPES)
+    #         creds = flow.run_local_server(port=0)
 
-        # Save the credentials for next run
-        with open('token.json', 'w') as token:
-            token.write(creds.to_json())
+    #     # Save the credentials for next run
+    #     with open('token.json', 'w') as token:
+    #         token.write(creds.to_json())
 
-    return creds
 
 MAPPING_FILENAME = "Data Mapping with ItemCode.xlsx"
 
@@ -134,13 +148,17 @@ def save_mapping_file_to_drive():
     creds = authenticate()
     service = build('drive', 'v3', credentials=creds)
     # Authenticate with Google Drive API
-    service = build('drive', 'v3', credentials=creds)
-    folder_id = "1HBRUZePST0D0buyU9MxeYg2vQyEL4wLF"
+    # service = build('drive', 'v3', credentials=creds)
 
     # List all files in the folder
+    # results = service.files().list(
+    #     q=f"'{folder_id}' in parents and mimeType='application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'",
+    #     fields="files(id, name)").execute()
+    
     results = service.files().list(
-        q=f"'{folder_id}' in parents and mimeType='application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'",
+        q=f"mimeType='application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'",
         fields="files(id, name)").execute()
+    
     files = results.get('files', [])
     files = [i for i in files if i.get('name')==MAPPING_FILENAME]
 
@@ -155,13 +173,13 @@ def save_mapping_file_to_drive():
             # Delete the existing file
             service.files().delete(fileId=existing_file_id).execute()
 
-    file_metadata = {'name': MAPPING_FILENAME, 'parents': [folder_id]}
+    file_metadata = {'name': MAPPING_FILENAME }
     media = MediaFileUpload(MAPPING_FILENAME, mimetype='application/vnd.openxmlformats-officedocument.spreadsheetml.sheet')
     service.files().create(body=file_metadata, media_body=media, fields='id').execute()
 
 def pull_mapping_file_from_drive():
     creds = authenticate()
-    service = build('drive', 'v3', credentials=creds)
+    # service = build('drive', 'v3', credentials=creds)
     # creds = Credentials.from_authorized_user_info(credentials_dict)
     # Authenticate with Google Drive API
     service = build('drive', 'v3', credentials=creds)
@@ -202,9 +220,11 @@ def main():
         extracted_file,data_for_mapping = convert_pdf_to_excel(uploaded_file)
         
         file_present = pull_mapping_file_from_drive()
+        print(file_present)
 
         if file_present:
             mapping_data_from_drive = pd.read_excel(MAPPING_FILENAME)
+            print(mapping_data_from_drive)
             extracted_data_for_mapping = pd.read_excel(data_for_mapping)
             extracted_data_for_mapping = extracted_data_for_mapping.merge(mapping_data_from_drive, on = ['Customer Part no as per pdf','Customer Part name as per pdf','Customer Part color  as per pdf'], how='outer')
             extracted_data_for_mapping.to_excel(data_for_mapping,index=False)
@@ -228,22 +248,21 @@ def main():
             st.markdown("## Upload the Data Master file with Item Code mapping")
             mapping_uploaded_file = st.file_uploader("Upload the Data Master file with Item Code mapping", type=["xlsx","ods"])
         else:
-            try:
-                mapping_data = pd.read_excel(MAPPING_FILENAME)
-                # mapping_data = mapping_data.rename(columns = {'Customer Part no as per pdf':'Part No.'})
-                data_for_mapping = "Data Mapping.xlsx"
-                extracted_data_for_mapping = pd.read_excel(data_for_mapping)
-                extracted_data_for_mapping = extracted_data_for_mapping[~extracted_data_for_mapping['Customer Part no as per pdf'].isin(mapping_data['Customer Part no as per pdf'])]
-                unmapped_part_no = extracted_data_for_mapping['Customer Part no as per pdf'].nunique()
-                if unmapped_part_no>0:
-                    st.markdown("#### There are {} Part No. with No ItemCode present. Upload a new file after mapping them".format(unmapped_part_no))
-                    mapping_uploaded_file = st.file_uploader("Upload the Data Master file with Item Code mapping", type=["xlsx","ods"])
-                else:
-                    st.markdown("#### Using the Mapping file available in Google Drive")
-                    mapping_uploaded_file =  MAPPING_FILENAME
-            except:
-                st.markdown("#### Using the Mapping file available in Google Drive")
-                mapping_uploaded_file =  MAPPING_FILENAME
+            mapping_data = pd.read_excel(MAPPING_FILENAME)
+            # mapping_data = mapping_data.rename(columns = {'Customer Part no as per pdf':'Part No.'})
+            data_for_mapping = "Data Mapping.xlsx"
+            extracted_data_for_mapping = pd.read_excel(data_for_mapping)
+            print(extracted_data_for_mapping)
+            print(mapping_data)
+
+            extracted_data_for_mapping = extracted_data_for_mapping[~extracted_data_for_mapping['Customer Part no as per pdf'].isin(mapping_data['Customer Part no as per pdf'])]
+            unmapped_part_no = extracted_data_for_mapping['Customer Part no as per pdf'].nunique()
+            if unmapped_part_no>0:
+                st.markdown("#### There are {} Part No. with No ItemCode present. Upload a new file after mapping them".format(unmapped_part_no))
+            mapping_uploaded_file = st.file_uploader("Upload the Data Master file with Item Code mapping", type=["xlsx","ods"])
+            # else:
+            #     st.markdown("#### Using the Mapping file available in Google Drive")
+            #     mapping_uploaded_file =  MAPPING_FILENAME
 
         if mapping_uploaded_file is not None:
             # st.write("Uploaded Mapping Excel file:", mapping_uploaded_file.name)