rdxz2-utill 0.0.8__tar.gz → 0.0.10__tar.gz

{rdxz2_utill-0.0.8/src/rdxz2_utill.egg-info → rdxz2_utill-0.0.10}/PKG-INFO

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

{rdxz2_utill-0.0.8 → rdxz2_utill-0.0.10}/pyproject.toml

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

{rdxz2_utill-0.0.8 → rdxz2_utill-0.0.10/src/rdxz2_utill.egg-info}/PKG-INFO

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

{rdxz2_utill-0.0.8 → rdxz2_utill-0.0.10}/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.8 → rdxz2_utill-0.0.10}/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.8 → rdxz2_utill-0.0.10}/src/utill/my_mb.py

@@ -12,6 +12,12 @@ from .my_dict import AutoPopulatingDict
 from .my_env import MB_FILENAME
 
 
+class UsersNotFoundException(Exception):
+    def __init__(self, username: list[str]):
+        self.message = f'User(s) {username} not exists'
+        super().__init__(self.message)
+
+
 def _decode_collection_location_to_group(collections_dict: dict, location: str):
     return ' > '.join(map(lambda x: collections_dict[x], map(int, location.strip('/').split('/'))))
 
@@ -21,10 +27,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
@@ -98,7 +104,7 @@ class MB:
                 not_exists.append(email)
 
         if not_exists:
-            raise ValueError(f'Email not exists: {not_exists}')
+            raise UsersNotFoundException(not_exists)
 
     def create_user(self, first_name: str, last_name: str, email: str, group_ids: list):
         self.send_request(HttpMethod.POST, 'api/user', {
@@ -111,7 +117,11 @@ class MB:
         logger.info(f'✅ Create user {email}')
 
     def deactivate_user_by_email(self, email: str):
-        user = self.dict__user_email__user[email]
+        try:
+            user = self.dict__user_email__user[email]
+        except KeyError as e:
+            raise UsersNotFoundException([email])
+
         self.send_request(HttpMethod.DELETE, f'api/user/{user["id"]}')
         del self.dict__user_email__user[email]
         logger.info(f'✅ Deactivate user [{user["id"]}] {email}')
@@ -120,8 +130,7 @@ class MB:
         try:
             self.dict__user_email__user[email]
         except KeyError as e:
-            logger.error(f'User {email} not exists')
-            raise e
+            raise UsersNotFoundException([email])
         self.send_request(HttpMethod.POST, 'api/session/forgot_password', {'email': email})
         logger.info(f'✅ Reset password {email}')