talentro-commons 0.19.10__tar.gz → 0.19.12__tar.gz

{talentro_commons-0.19.10 → talentro_commons-0.19.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: talentro-commons
-Version: 0.19.10
+Version: 0.19.12
 Summary: This package contains all globally used code, services, models and data structures for Talentro
 License: Proprietary
 Author: Emiel van Essen

{talentro_commons-0.19.10 → talentro_commons-0.19.12}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "talentro-commons"
-version = "0.19.10"
+version = "0.19.12"
 description = "This package contains all globally used code, services, models and data structures for Talentro"
 authors = ["Emiel van Essen <emiel@marksmen.nl>"]
 license = "Proprietary"

{talentro_commons-0.19.10 → talentro_commons-0.19.12}/src/talentro/services/google_storage.py

@@ -27,8 +27,12 @@ class BucketEnum(StrEnum):
 class FilePathEnum(StrEnum):
     IAM_ORGANIZATION_LOGO = "iam/organizations/{organization_id}/details/logo.{extension}"
     IAM_PROFILE_PICTURE = "iam/users/{user_id}/profile/profile_picture.{extension}"
+
+    # Candidates
     CANDIDATES_CANDIDATE_CV_FILE = "organizations/{organization_id}/cand_{candidate_id}/cv/{file_name}"
     CANDIDATES_CANDIDATE_CV_FOLDER = "organizations/{organization_id}/cand_{candidate_id}/cv/"
+
+    # DPG
     SYSTEM_DPG_SYNC = "dpg/last_sync.txt"
 
 
@@ -66,7 +70,7 @@ class GoogleStorage(metaclass=SingletonMeta):
 
     def _get_bucket(self, bucket: BucketEnum) -> Bucket:
         try:
-            bucket = self._client.get_bucket(bucket.value)
+            bucket = self._client.get_bucket(f"talentro-{self.env}-{bucket.value}")
         except NotFound:
             print(f"Bucket {bucket.value} not found, creating...")
             bucket = self._client.create_bucket(bucket.value)
@@ -91,13 +95,13 @@ class GoogleStorage(metaclass=SingletonMeta):
         blob = bucket.blob(filled_destination_path)
         return blob
 
-    def get_blob(self, bucket: BucketEnum, destination: FilePathEnum, path_definitions: dict) -> Blob:
+    def get_blob(self, bucket: BucketEnum, destination: FilePathEnum, path_definitions: dict | None = None) -> Blob:
         """Deletes a blob from the bucket."""
         blob = self._get_blob(bucket, destination, path_definitions)
         blob.reload()
         return blob
 
-    def delete_file(self, bucket: BucketEnum, destination: FilePathEnum, path_definitions: dict) -> bool:
+    def delete_file(self, bucket: BucketEnum, destination: FilePathEnum, path_definitions: dict | None = None) -> bool:
         """Deletes a blob from the bucket."""
         try:
             blob = self._get_blob(bucket, destination, path_definitions)
@@ -110,7 +114,7 @@ class GoogleStorage(metaclass=SingletonMeta):
             traceback.print_exc()
             return False
 
-    def delete_folder(self, bucket: BucketEnum, destination: FilePathEnum, path_definitions: dict) -> bool:
+    def delete_folder(self, bucket: BucketEnum, destination: FilePathEnum, path_definitions: dict | None = None) -> bool:
         """Deletes a blob from the bucket."""
         try:
             bucket = self._get_bucket(bucket)
@@ -127,7 +131,7 @@ class GoogleStorage(metaclass=SingletonMeta):
             return False
 
     def upload_file(self, file: UploadFile, bucket: BucketEnum, destination: FilePathEnum,
-                    path_definitions: dict) -> Blob:
+                    path_definitions: dict | None = None) -> Blob:
         """
         Uploads a file to Google Storage