rdxz2-utill 0.1.1__tar.gz → 0.1.3__tar.gz

{rdxz2_utill-0.1.1/src/rdxz2_utill.egg-info → rdxz2_utill-0.1.3}/PKG-INFO

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

{rdxz2_utill-0.1.1 → rdxz2_utill-0.1.3}/pyproject.toml

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

{rdxz2_utill-0.1.1 → rdxz2_utill-0.1.3/src/rdxz2_utill.egg-info}/PKG-INFO

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

{rdxz2_utill-0.1.1 → rdxz2_utill-0.1.3}/src/rdxz2_utill.egg-info/SOURCES.txt

@@ -32,6 +32,7 @@ src/utill/cmd/_bq.py
 src/utill/cmd/_conf.py
 src/utill/cmd/_enc.py
 src/utill/cmd/_main.py
+src/utill/cmd/_mb.py
 src/utill/cmd/_pg.py
 src/utill/cmd/utill.py
 src/utill/templates/mb.json

rdxz2_utill-0.1.3/src/utill/cmd/_mb.py

@@ -0,0 +1,60 @@
+def _grant(emails: list[str], urls: list[str]):
+    from ..my_mb import MB
+
+    mb = MB()
+    mb.make_sure_all_email_exists(emails)
+
+    question_urls = []
+    collection_urls = []
+    dashboard_urls = []
+    for url in urls:
+        if not url.startswith(mb.base_url):
+            raise ValueError(f'URL must be a Metabase URL: {url}')
+
+        url_stripped = url.removeprefix(mb.base_url)
+        if url_stripped.startswith('/collection/'):
+            collection_urls.append(url)
+        elif url_stripped.startswith('/question/'):
+            question_urls.append(url)
+        elif url_stripped.startswith('/dashboard/'):
+            dashboard_urls.append(url)
+        else:
+            raise ValueError(f'URL is neither a collection/question/dashboard: {url} --> {url_stripped}')
+
+    for email in emails:
+        for question_url in question_urls:
+            mb.grant_user_email_to_question_by_url(email, question_url)
+        for collection_url in collection_urls:
+            mb.grant_user_email_to_collection_by_url(email, collection_url)
+        for dashboard_url in dashboard_urls:
+            mb.grant_user_email_to_dashboard_by_url(email, dashboard_url)
+
+
+def _copy_permissions(src_email: str, dst_emails: list[str]):
+    from ..my_mb import MB
+
+    mb = MB()
+    mb.make_sure_all_email_exists([src_email] + dst_emails)
+
+    for dst_email in dst_emails:
+        mb.mirror_user_permission_by_email(src_email, dst_email)
+
+
+def _reset_password(emails: list[str]):
+    from ..my_mb import MB
+
+    mb = MB()
+    mb.make_sure_all_email_exists(emails)
+
+    for email in emails:
+        mb.reset_password_by_email(email)
+
+
+def _deactivate_user(emails: list[str]):
+    from ..my_mb import MB
+
+    mb = MB()
+    mb.make_sure_all_email_exists(emails)
+
+    for email in emails:
+        mb.deactivate_user_by_email(email)

{rdxz2_utill-0.1.1 → rdxz2_utill-0.1.3}/src/utill/cmd/utill.py

@@ -5,7 +5,7 @@ import click
 def main(): pass
 
 
-# Conf
+# MARK: Conf
 
 
 @main.group('conf', help='Configure this library')
@@ -21,7 +21,28 @@ def main__conf__list(**kwargs): from ._conf import _list; _list(**kwargs)
 def main__conf__set(**kwargs): from ._conf import _set; _set(**kwargs)
 
 
-# PG
+# MARK: Metabase
+
+
+@main.group('mb', help='Metabase utility commands')
+def main__mb(): pass
+@main__mb.command('julo-grant', help='Grant access to Metabase questions/collections/dashboards')
+@click.option('-u', '--email', 'emails', type=str, multiple=True, help='User emails')
+@click.option('-l', '--url', 'urls', type=str, multiple=True, help='URLs')
+def main__mb__grant(**kwargs): from ._mb import _grant; _grant(**kwargs)
+@main__mb.command('copy-permissions', help='Copy all permissions from one user to another')
+@click.argument('src_email', type=str)
+@click.argument('dst_emails', type=str, nargs=-1)
+def main__mb__copy_permissions(**kwargs): from ._mb import _copy_permissions; _copy_permissions(**kwargs)
+@main__mb.command('reset-password', help='Reset Metabase user password')
+@click.option('-u', '--email', 'emails', type=str, required=True, multiple=True, help='User emails')
+def main__mb__reset_password(**kwargs): from ._mb import _reset_password; _reset_password(**kwargs)
+@main__mb.command('deactivate-user', help='Deactivate Metabase user')
+@click.option('-u', '--email', 'emails', type=str, required=True, multiple=True, help='User emails')
+def main__mb__deactivate_user(**kwargs): from ._mb import _deactivate_user; _deactivate_user(**kwargs)
+
+
+# MARK: PG
 
 
 @main.group('pg', help='PostgreSQL utility')
@@ -40,7 +61,7 @@ def main__pg__pg_to_pg(**kwargs): from ._pg import _pg_to_pg; _pg_to_pg(**kwargs
 def main__pg__upload_csv(**kwargs): from ._pg import _upload_csv; _upload_csv(**kwargs)
 
 
-# BQ
+# MARK: BQ
 
 
 @main.group('bq', help='BigQuery utility')
@@ -60,7 +81,7 @@ def main__bq__upload_csv(**kwargs): from ._bq import _upload_csv; _upload_csv(**
 def main__bq__download_table(**kwargs): from ._bq import _download_table; _download_table(**kwargs)
 
 
-# Encyrption
+# MARK: Encyrption
 
 
 @main.group('enc', help='Encryption utility')
@@ -71,7 +92,7 @@ def main__enc(): pass
 def main__enc__encrypt(**kwargs): from ._enc import _encrypt; _encrypt(**kwargs)
 
 
-# Other utilities
+# MARK: Other utilities
 
 
 @main.command('random', help='Generate random string')

{rdxz2_utill-0.1.1 → rdxz2_utill-0.1.3}/src/utill/my_bq.py

@@ -312,21 +312,24 @@ class BQ():
 
     def upload_csv(
         self,
-        src_filename: str,
+        src_filepath: str,
         dst_table_fqn: str,
         schema: list[dict] | None = None,
         gcs_bucket: str | None = None,
         partition_by: str = None,
-        cluster_cols: list[str] = None,
+        clustering_fields: list[str] = None,
         compression: DataFileCompression | None = None,
         load_strategy: LoadStrategy = LoadStrategy.APPEND,
     ):
         self.raise_for_invalid_table_fqn(dst_table_fqn)
 
-        if compression == DataFileCompression.GZIP and not src_filename.endswith('.gz'):
+        if compression == DataFileCompression.GZIP and not src_filepath.endswith('.gz'):
             raise ValueError('Please provide file path with .gz extension if using compression = GZIP')
-        elif not src_filename.endswith('.csv'):
+        elif not src_filepath.endswith('.csv'):
             raise ValueError('Please provide file path with .csv extension')
+        
+        src_filename, src_fileextension = os.path.splitext(src_filepath)
+        src_filename = os.path.basename(src_filename)  # Only get filename
 
         # # <<----- START: Upload to GCS
 
@@ -354,12 +357,21 @@ class BQ():
         # Upload to GCS
         # TODO: Re-implement the producer-consumer model to upload multiple files
         gcs = my_gcs.GCS(bucket=gcs_bucket, project_id=self.client.project)
-        dst_blobpath = f'tmp/my_bq/{my_datetime.get_current_datetime_str()}/{my_string.replace_nonnumeric(os.path.basename(src_filename), "_").lower()}'
-        gcs.upload(src_filename, dst_blobpath)
+        dst_blobpath = f'tmp/my_bq/{my_datetime.get_current_datetime_str()}/{my_string.replace_nonnumeric(src_filename, "_").lower()}{src_fileextension}'
+        gcs.upload(src_filepath, dst_blobpath)
 
         # Load to BQ
         try:
-            self.load_data(dst_blobpath, dst_table_fqn, schema=schema, partition_by=partition_by, cluster_cols=cluster_cols, format=DataFileFormat.CSV, compression=compression, load_strategy=load_strategy)
+            self.load_data(
+                f'gs://{gcs.bucket.name}/{dst_blobpath}',
+                dst_table_fqn,
+                schema=schema,
+                partition_by=partition_by,
+                clustering_fields=clustering_fields,
+                format=DataFileFormat.CSV,
+                compression=compression,
+                load_strategy=load_strategy,
+            )
         except:
             raise
         finally:
@@ -399,7 +411,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
@@ -435,7 +447,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.1 → rdxz2_utill-0.1.3}/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)