talentro-commons 0.19.9__tar.gz → 0.19.11__tar.gz

{talentro_commons-0.19.9 → talentro_commons-0.19.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: talentro-commons
-Version: 0.19.9
+Version: 0.19.11
 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.9 → talentro_commons-0.19.11}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "talentro-commons"
-version = "0.19.9"
+version = "0.19.11"
 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.9 → talentro_commons-0.19.11}/src/talentro/services/google_storage.py

@@ -6,8 +6,8 @@ from enum import StrEnum
 from http import HTTPStatus
 
 from fastapi import UploadFile
-from google.api_core.exceptions import NotFound
 from google.cloud import storage
+from google.cloud.exceptions import NotFound
 from google.cloud.storage import Bucket, Blob
 from talentro.constants import ErrorCode, DisplayMessage
 from talentro.exceptions import APIException
@@ -18,24 +18,35 @@ from ..util.string import render_template_path
 
 
 class BucketEnum(StrEnum):
-    PUBLIC = "talentro-static"
-    BILLING = "talentro-billing"
-    CANDIDATES = "talentro-candidates"
+    PUBLIC = "static"
+    BILLING = "billing"
+    CANDIDATES = "candidates"
+    SYSTEM = "system"
 
 
 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"
+
 
 class GoogleStorage(metaclass=SingletonMeta):
 
     def __init__(self):
         self._client = storage.Client()
+        self.env = os.getenv("ENVIRONMENT")
 
-    def upload_base64_to_gcs(self, file: FileData, bucket: BucketEnum, destination: FilePathEnum, path_definitions: dict) -> Blob:
+        if not self.env:
+            raise Exception("Environment variable ENVIRONMENT is not set.")
+
+    def upload_base64_to_gcs(self, file: FileData, bucket: BucketEnum, destination: FilePathEnum,
+                             path_definitions: dict | None = None) -> Blob:
         file_bytes = base64.b64decode(file.data)
 
         _, ext = os.path.splitext(file.file_name)
@@ -49,7 +60,7 @@ class GoogleStorage(metaclass=SingletonMeta):
 
         blob.upload_from_filename(
             tmp_path,
-            content_type=file.content_type  # handig voor GCS metadata
+            content_type=file.content_type  # Handig voor GCS metadata
         )
 
         if os.path.exists(tmp_path):
@@ -59,14 +70,15 @@ 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("Bucket not found.")
+            print(f"Bucket {bucket.value} not found, creating...")
             bucket = self._client.create_bucket(bucket.value)
 
         return bucket
 
-    def _get_blob(self, bucket: BucketEnum, destination: FilePathEnum, path_definitions: dict):
+    def _get_blob(self, bucket: BucketEnum, destination: FilePathEnum, path_definitions: dict | None = None):
+
         bucket = self._get_bucket(bucket)
 
         try:
@@ -118,7 +130,8 @@ class GoogleStorage(metaclass=SingletonMeta):
             traceback.print_exc()
             return False
 
-    def upload_file(self, file: UploadFile, bucket: BucketEnum, destination: FilePathEnum, path_definitions: dict) -> Blob:
+    def upload_file(self, file: UploadFile, bucket: BucketEnum, destination: FilePathEnum,
+                    path_definitions: dict) -> Blob:
         """
         Uploads a file to Google Storage
 

{talentro_commons-0.19.9 → talentro_commons-0.19.11}/src/talentro/util/string.py

@@ -1,10 +1,16 @@
 import string
 
-def render_template_path(template: str, values: dict) -> str:
+def render_template_path(template: str, values: dict | None) -> str:
     formatter = string.Formatter()
 
     required_fields = [field for _, field, _, _ in formatter.parse(template) if field]
 
+    if required_fields is None or required_fields is []:
+        return template
+
+    if not values:
+        raise ValueError(f"Values are expected but not set")
+
     missing = [field for field in required_fields if field not in values]
 
     if missing: