talentro-commons 0.19.9__py3-none-any.whl → 0.19.10__py3-none-any.whl

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,9 +18,10 @@ 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):
@@ -28,14 +29,20 @@ class FilePathEnum(StrEnum):
     IAM_PROFILE_PICTURE = "iam/users/{user_id}/profile/profile_picture.{extension}"
     CANDIDATES_CANDIDATE_CV_FILE = "organizations/{organization_id}/cand_{candidate_id}/cv/{file_name}"
     CANDIDATES_CANDIDATE_CV_FOLDER = "organizations/{organization_id}/cand_{candidate_id}/cv/"
+    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 +56,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):
@@ -61,12 +68,13 @@ class GoogleStorage(metaclass=SingletonMeta):
         try:
             bucket = self._client.get_bucket(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 +126,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/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:

{talentro_commons-0.19.9.dist-info → talentro_commons-0.19.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: talentro-commons
-Version: 0.19.9
+Version: 0.19.10
 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.dist-info → talentro_commons-0.19.10.dist-info}/RECORD

@@ -26,19 +26,19 @@ talentro/services/billing.py,sha256=Y2UaQK8lSRa3G8lTZKqLi4t-Jc-EWd7Yn15nR9HOAx8,
 talentro/services/caching.py,sha256=mmjhXAMJ_g8D8cJqn15YqZ7ST-G5lD9MS-PmlowI7pU,2921
 talentro/services/clients.py,sha256=vluOrdYdDAQLyGR9-EmogLjA9OUlJtHy0tYD9LhwxKg,2174
 talentro/services/db.py,sha256=cnKCrYG7GwIu7ZZhA25D-yaXaiCJqPpzfcanWquyrBY,822
-talentro/services/google_storage.py,sha256=p7fX9u8rWLS0DHcw-4aYVJAqkA_RYkDgEBGH6zmpzdA,4835
+talentro/services/google_storage.py,sha256=edol1h4lXshcJSoFr8tUPNR5hX8W619D_cAUTD4-Pyk,5121
 talentro/services/rabbitmq.py,sha256=RNIsLqXM48z5SRRqJ3iWqhRp6FL9TwRwEeii_m8-xDo,6854
 talentro/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 talentro/util/attributes.py,sha256=PgJnn9LMtHkiNIaMov2HQt5944HweD6gRlAHBZrJGPA,448
 talentro/util/enum.py,sha256=YftsoJKnrn8HAjA2Q1tqIYBMrNnlq6m1b34N8hfykbE,155
 talentro/util/files.py,sha256=0pfISW89XC5kNyFooHebjVdmMnP-L49uIpKY5DjGuN4,176
 talentro/util/singleton.py,sha256=nM5XgRa75xF6gX4BZKlkvjtZJQ3OFFEsANLVLnsyxmM,635
-talentro/util/string.py,sha256=KJmN96w1E63r4-7P4MKahEnetb4IMz1VpYmuBIT0MW4,398
+talentro/util/string.py,sha256=i8oODLdCj6F3-9jgdgyLzNfoMM3i5ee_8SkovENnw5s,568
 talentro/util/vacancy.py,sha256=mZ_ruL_YPsbJjaUEti78_6TumXhOGAY7Taa2JvXkTkg,1067
 talentro/vacancies/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 talentro/vacancies/dataclasses.py,sha256=E6H5fsZH4IwtBFSLDolzF6u39tEIrANtWiNVoB65P0c,15074
 talentro/vacancies/models.py,sha256=GoXr71CNzU6csf8gdmv84etb3Rm-Cdfigp1yqPI_jjQ,4822
 talentro/vacancies/taxanomy.py,sha256=K3f0yD5g-oxhLXSYNY4WSsGzBfBIb6ngsTDVNGbqO30,6324
-talentro_commons-0.19.9.dist-info/METADATA,sha256=SaULkE38ZGSyPMutptjhRGCpQf4yL-WZmVi_Q0yCW40,1507
-talentro_commons-0.19.9.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-talentro_commons-0.19.9.dist-info/RECORD,,
+talentro_commons-0.19.10.dist-info/METADATA,sha256=eLypP7xaBLwQxtc8ilGhxDOwj2qwch6mQoRiI6RE8RE,1508
+talentro_commons-0.19.10.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+talentro_commons-0.19.10.dist-info/RECORD,,