rdxz2-utill 0.1.0__py3-none-any.whl → 0.1.2__py3-none-any.whl

{rdxz2_utill-0.1.0.dist-info → rdxz2_utill-0.1.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rdxz2-utill
-Version: 0.1.0
+Version: 0.1.2
 Summary: Your daily Python utility
 Author-email: Richard Dharmawan <richard.dharmawan@gmail.com>
 License: MIT License

{rdxz2_utill-0.1.0.dist-info → rdxz2_utill-0.1.2.dist-info}/RECORD

@@ -1,6 +1,6 @@
-rdxz2_utill-0.1.0.dist-info/licenses/LICENSE,sha256=PF9CUvzP8XFYopEAzrMzSCovF7RdBdscPqJCDC6KjPc,1073
+rdxz2_utill-0.1.2.dist-info/licenses/LICENSE,sha256=PF9CUvzP8XFYopEAzrMzSCovF7RdBdscPqJCDC6KjPc,1073
 utill/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-utill/my_bq.py,sha256=1BKjYa05yfOBInm245373lfi4sbOZKybYXdYmON2npM,24985
+utill/my_bq.py,sha256=Y2zNCx7V71N8iNNEE-IB3KQuQDUeV7ZQbLJ4jY-N12Q,25108
 utill/my_compare.py,sha256=619QbVk3GihWxen95yVnivKHkah8GgPTLGiSkgHxykw,886
 utill/my_const.py,sha256=88dOqn6NPQ5-hfRqdkew5POoAIyO91XXOGvN76oNsdo,251
 utill/my_csv.py,sha256=AT5sAbAlYqnAmNgQMTSqEueRXM4D42yNPb5C3Hedy6c,2921
@@ -9,7 +9,7 @@ utill/my_dict.py,sha256=jPaPfdn4WYpm0uIBPiYFinpHhx1jXpFVDJ9npmvxGZQ,391
 utill/my_encryption.py,sha256=SCF7PPur39cW4RHidsRhw-9BZP-ymUH-6LZ9nAHJDsY,2105
 utill/my_env.py,sha256=E7XW3fuhxbDlFqmLPHrziJJZVRogzGh6rfQdyNV49f8,2130
 utill/my_file.py,sha256=-b6_dGDDBdS228kgwTYpmIa3vxW1c1TtWrLdzdlHjKY,1873
-utill/my_gcs.py,sha256=VBJ8lsJ-fHr_BzMoSuT5JUrvxidGyMc2VNtE6Um1T_M,3060
+utill/my_gcs.py,sha256=qFH47gQmk6_v0DajihymX7Xx1ZVp4xWuxDQh90PrY0g,3088
 utill/my_input.py,sha256=OyKLoutXpwISReltuL_Gw2oojv16tYWJqQpqabBOQx4,350
 utill/my_json.py,sha256=WgW6mavGhfs4h1N5XbhsDnRk2dbh_ttJWdJUj4iWDN4,1473
 utill/my_mb.py,sha256=IyrySs92TqtjBUvPMeUN3P2kRK8EttTFRPZsv5Cr-xw,15090
@@ -28,8 +28,8 @@ utill/cmd/_pg.py,sha256=RVxEiSifyIwMDYDM69vt6WSLdVDr1cMzY6r4T2PzNRA,492
 utill/cmd/utill.py,sha256=TlHfiwOUcK1m58PrRCjX9sARiPYZUsoTk-KOTCOz1vM,3558
 utill/templates/mb.json,sha256=M46ZHSaSh4rbD_KGUViGr2B2ZV8_PC-O5Evqi35JK5g,59
 utill/templates/pg.json,sha256=LkJt0VV3zcyt7Tpn6gulsoVQgUc-9uImXOStvzu8cdU,271
-rdxz2_utill-0.1.0.dist-info/METADATA,sha256=iB4cHw4zIQnP_2DHvIkBpwKxR5s32RVXr9xyJiY-GX4,4401
-rdxz2_utill-0.1.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-rdxz2_utill-0.1.0.dist-info/entry_points.txt,sha256=9n5NWz5Wi9jDvYhB_81_4icgT5xABZ-QivHD8ibcafg,47
-rdxz2_utill-0.1.0.dist-info/top_level.txt,sha256=tuAYZoCsr02JYbpZj7I6fl1IIo53v3GG0uoj-_fINVk,6
-rdxz2_utill-0.1.0.dist-info/RECORD,,
+rdxz2_utill-0.1.2.dist-info/METADATA,sha256=6tzVkvnpQcGVE24Zn3Z__yGHJeyP-mopwN35cY_gMiw,4401
+rdxz2_utill-0.1.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+rdxz2_utill-0.1.2.dist-info/entry_points.txt,sha256=9n5NWz5Wi9jDvYhB_81_4icgT5xABZ-QivHD8ibcafg,47
+rdxz2_utill-0.1.2.dist-info/top_level.txt,sha256=tuAYZoCsr02JYbpZj7I6fl1IIo53v3GG0uoj-_fINVk,6
+rdxz2_utill-0.1.2.dist-info/RECORD,,

utill/my_bq.py

@@ -178,7 +178,8 @@ class BQ():
                 schema_str = ',\n'.join([column['name'] for column in schema])
                 query_parts.append(f'(\n{schema_str}\n)')
             if table_options:
-                query_parts.append(f'OPTIONS (\n{",\n".join(table_options)}\n)')
+                table_options_str = ',\n'.join(table_options)
+                query_parts.append(f'OPTIONS (\n{table_options_str}\n)')
         else:
             logger.debug('Table not exist, constructing CREATE TABLE query ...')
             query_parts = [
@@ -193,7 +194,8 @@ class BQ():
                 clustering_fields_str = ', '.join([f'`{field}`' for field in clustering_fields])
                 query_parts.append(f'CLUSTER BY {clustering_fields_str}')
             if table_options:
-                query_parts.append(f'OPTIONS (\n{",\n".join(table_options)}\n)')
+                table_options_str = ',\n'.join(table_options)
+                query_parts.append(f'OPTIONS (\n{table_options_str}\n)')
             query_parts.append('AS')
         query_parts.append(textwrap.dedent(query).strip())
 
@@ -397,7 +399,7 @@ class BQ():
                 for tmp_blobs in gcs.list_blobs(dst_gcs_prefix):
                     local_tmp_filepath = os.path.join(tmp_dirname, tmp_blobs.name.split('/')[-1])
                     gcs.download(tmp_blobs, local_tmp_filepath, move=True)
-                    logger.debug(f'Downloaded {tmp_blobs.name} to {local_tmp_filepath}')
+                    # logger.debug(f'Downloaded {tmp_blobs.name} to {local_tmp_filepath}')
                     local_tmp_filepaths.append(local_tmp_filepath)
 
                 # Combine downloaded files
@@ -433,7 +435,7 @@ class BQ():
                 for part in range(parts):
                     dst_filepath_part = f'{dst_filepath.removesuffix(".csv")}_{part + 1:06}.csv'
                     _export_download_combine(
-                        f'SELECT * EXCEPT(_rn) FROM `{tmp_table_fqn_rn}` WHERE _rn BETWEEN {(part * csv_row_limit) + 1} AND {(part + 1) * csv_row_limit}',
+                        f'SELECT * EXCEPT(_rn) FROM `{tmp_table_fqn_rn}` WHERE _rn BETWEEN {(part * csv_row_limit) + 1} AND {(part + 1) * csv_row_limit} ORDER BY _rn',
                         dst_gcs_prefix=gcs.build_tmp_dirpath(),
                         dst_filepath=dst_filepath_part,
                     )

utill/my_gcs.py

@@ -16,7 +16,7 @@ class GCS:
 
         self.client = storage.Client(project=project_id or envs.GCP_PROJECT_ID)
         self.bucket = self.client.bucket(bucket or envs.GCS_BUCKET)
-        logger.debug(f'GCS client open, project: {self.client.project}')
+        logger.debug(f'GCS client open, project: {self.client.project}, bucket: {self.bucket.name}')
 
     def get_blob(self, blobpath: str) -> storage.Blob:
         return self.bucket.blob(blobpath)