rdxz2-utill 0.1.0__tar.gz → 0.1.2__tar.gz

{rdxz2_utill-0.1.0/src/rdxz2_utill.egg-info → rdxz2_utill-0.1.2}/PKG-INFO

@@ -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 → rdxz2_utill-0.1.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "rdxz2-utill"
-version = "0.1.0"
+version = "0.1.2"
 authors = [
   { name="Richard Dharmawan", email="richard.dharmawan@gmail.com" },
 ]

{rdxz2_utill-0.1.0 → rdxz2_utill-0.1.2/src/rdxz2_utill.egg-info}/PKG-INFO

@@ -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 → rdxz2_utill-0.1.2}/src/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,
                     )

{rdxz2_utill-0.1.0 → rdxz2_utill-0.1.2}/src/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)