rdxz2-utill 0.0.7__tar.gz → 0.0.9__tar.gz

{rdxz2_utill-0.0.7/src/rdxz2_utill.egg-info → rdxz2_utill-0.0.9}/PKG-INFO

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

{rdxz2_utill-0.0.7 → rdxz2_utill-0.0.9}/pyproject.toml

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

{rdxz2_utill-0.0.7 → rdxz2_utill-0.0.9/src/rdxz2_utill.egg-info}/PKG-INFO

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

{rdxz2_utill-0.0.7 → rdxz2_utill-0.0.9}/src/utill/my_bq.py

@@ -58,11 +58,15 @@ class Dtype:
 
 
 class BQ():
-    def __init__(self, project: str = None):
+    def __init__(self, project: str = None, service_account_filename: str = None):
         self.project = project or envs.GCP_PROJECT_ID
 
-        self.client = bigquery.Client(project=self.project)
-        logger.debug(f'BQ client open, project: {self.project or "<application-default>"}')
+        if service_account_filename is not None:
+            self.client = bigquery.Client.from_service_account_json(service_account_filename)
+        else:
+            self.client = bigquery.Client(project=self.project)
+
+        logger.debug(f'BQ client open, project: {self.client.project}')
 
     def __enter__(self):
         return self
@@ -247,7 +251,7 @@ class BQ():
     def download_csv(self, query: str, dst_filename: str, combine: bool = True, pre_query: str = None):
         if not dst_filename.endswith('.csv'):
             raise ValueError('Destination filename must ends with .csv!')
-        
+
         dst_filename = os.path.expanduser(dst_filename)
 
         dirname = dst_filename.removesuffix('.csv')

{rdxz2_utill-0.0.7 → rdxz2_utill-0.0.9}/src/utill/my_gcs.py

@@ -9,16 +9,20 @@ from .my_env import envs
 
 class GCS:
 
-    def __init__(self, project: str = None, bucket_name: str = None):
+    def __init__(self, project: str = None, service_account_filename: str = None, bucket_name: str = None):
         self.project = project if project is not None else envs.GCP_PROJECT_ID
-        self.client = storage.Client(project=self.project)
+
+        if service_account_filename is not None:
+            self.client = storage.Client.from_service_account_json(service_account_filename)
+        else:
+            self.client = storage.Client(project=self.project)
 
         bucket_name_parts = (bucket_name or envs.GCS_BUCKET).split('/')
         self.change_bucket(bucket_name_parts[0])
         self.base_path = '/'.join(bucket_name_parts[1:]) if len(bucket_name_parts) > 1 else None
         not self.base_path or logger.debug(f'Base path: {self.base_path}')
 
-        logger.debug(f'GCS client open, project: {project or "<application-default>"}')
+        logger.debug(f'GCS client open, project: {self.client.project}')
 
     def __enter__(self):
         return self

{rdxz2_utill-0.0.7 → rdxz2_utill-0.0.9}/src/utill/my_mb.py

@@ -21,10 +21,10 @@ def _translate_user_group_ids(user: dict) -> set:
 
 
 class MB:
-    def __init__(self, base_url: str = None) -> None:
-        config = json.loads(open(MB_FILENAME, 'r').read())
+    def __init__(self, config_source: str = MB_FILENAME) -> None:
+        config = json.loads(open(config_source, 'r').read())
 
-        self.base_url = base_url or config['base_url']
+        self.base_url = config['base_url']
         self.api_key = config['api_key']
 
         self._is_user_initialized = False

{rdxz2_utill-0.0.7 → rdxz2_utill-0.0.9}/src/utill/my_pg.py

@@ -74,7 +74,7 @@ class PG:
 
         self.conn.autocommit = autocommit
 
-    def execute_query(self, query: str, params: tuple):
+    def execute_query(self, query: str, params: tuple = None):
         # Make sure connection alive
         if self.conn.closed:
             self.establish_connection(self.conn.autocommit, self.row_factory)