maleo-foundation 0.2.68__py3-none-any.whl → 0.2.70__py3-none-any.whl

maleo_foundation/managers/service.py

@@ -91,11 +91,10 @@ class MaleoClientConfiguration(BaseModel):
 
 class MaleoClientConfigurations(BaseModel):
     metadata:MaleoClientConfiguration = Field(..., description="MaleoMetadata client's configuration")
-    security:MaleoClientConfiguration = Field(..., description="MaleoSecurity client's configuration")
-    storage:MaleoClientConfiguration = Field(..., description="MaleoStorage client's configuration")
     identity:MaleoClientConfiguration = Field(..., description="MaleoIdentity client's configuration")
     access:MaleoClientConfiguration = Field(..., description="MaleoAccess client's configuration")
-    soapie:MaleoClientConfiguration = Field(..., description="MaleoSOAPIE client's configuration")
+    workshop:MaleoClientConfiguration = Field(..., description="MaleoWorkshop client's configuration")
+    medix:MaleoClientConfiguration = Field(..., description="MaleoMedix client's configuration")
     fhir:MaleoClientConfiguration = Field(..., description="MaleoFHIR client's configuration")
     dicom:MaleoClientConfiguration = Field(..., description="MaleoDICOM client's configuration")
     scribe:MaleoClientConfiguration = Field(..., description="MaleoScribe client's configuration")

maleo_foundation/utils/loaders/credential/google.py

@@ -6,20 +6,27 @@ from typing import Optional, Union
 
 class GoogleCredentialsLoader:
     @staticmethod
-    def load(credentials_path:Optional[Union[Path, str]] = None) -> Credentials:
+    def load(credentials_path: Optional[Union[Path, str]] = None) -> Credentials:
+        """
+        Load Google credentials either from a service account file or from the default credentials.
+        Priority:
+        1. Explicit path argument
+        2. GOOGLE_CREDENTIALS_PATH environment variable
+        3. google.auth.default()
+        """
         if credentials_path is None:
             credentials_path = os.getenv("GOOGLE_CREDENTIALS_PATH")
-        else:
-            credentials_path = credentials_path
+
+        if credentials_path is not None:
+            credentials_path = Path(credentials_path)
+            if credentials_path.exists() and credentials_path.is_file():
+                try:
+                    return Credentials.from_service_account_file(str(credentials_path))
+                except Exception as e:
+                    raise ValueError(f"Failed to load credentials from file: {str(e)}")
+
         try:
-            if credentials_path is not None:
-                credentials_path = Path(credentials_path)
-                if credentials_path.exists() or credentials_path.is_file():
-                    credentials = Credentials.from_service_account_file(
-                        filename=str(credentials_path)
-                    )
-            else:
-                credentials, _ = default()
+            credentials, _ = default()
             return credentials
         except Exception as e:
-            raise ValueError(f"Failed to initialize credentials: {str(e)}")
+            raise ValueError(f"Failed to load default credentials: {str(e)}")

{maleo_foundation-0.2.68.dist-info → maleo_foundation-0.2.70.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maleo_foundation
-Version: 0.2.68
+Version: 0.2.70
 Summary: Foundation package for Maleo
 Author-email: Agra Bima Yuda <agra@nexmedis.com>
 License: MIT

{maleo_foundation-0.2.68.dist-info → maleo_foundation-0.2.70.dist-info}/RECORD

@@ -34,7 +34,7 @@ maleo_foundation/expanded_types/encryption/rsa.py,sha256=Esf_H8nMz2kOLAWa3M7dlD-
 maleo_foundation/managers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 maleo_foundation/managers/db.py,sha256=cpY1IOiUytT9XXYtzS0E9OSYOuB7jBKo0XHe__uI1Jg,5340
 maleo_foundation/managers/middleware.py,sha256=77wRCC_CWc22nSDL-UJanO3rXmSB7wLzaAIXEFjXq6M,4249
-maleo_foundation/managers/service.py,sha256=CB6JI_jMWrVQo32jJ3oCGRgSdOfsdBehCu1pVhAJzBo,19251
+maleo_foundation/managers/service.py,sha256=3POmJNxxdBxU6mvHdCyMTV7zFSp6_H8tWM2pvj-HqGk,19148
 maleo_foundation/managers/cache/__init__.py,sha256=CeY0oof2bVl_v5WS-FKXNwn2gf3xrEMfUsHK9cHo59s,471
 maleo_foundation/managers/cache/base.py,sha256=YyPjde4KTsp2IHV6NdFMysa0ev-1GX1rtX-0jQPuIBU,837
 maleo_foundation/managers/cache/redis.py,sha256=xLa8QfXdNtghs0eBxIqc04H3XTYmxLEzrqJZAFCigvM,1150
@@ -115,10 +115,10 @@ maleo_foundation/utils/loaders/__init__.py,sha256=P_3ycGfeDXFjAi8bE4iLWHxBveqUId
 maleo_foundation/utils/loaders/json.py,sha256=8e3qe1TyL-jaJVuiQJpVHKDBS2n_CGJPGv8Ci6cK42Y,506
 maleo_foundation/utils/loaders/yaml.py,sha256=8cZWOYuDTAFNrLsUlz7IGyOrtR4oL-tk-jc7q_7nq8Q,501
 maleo_foundation/utils/loaders/credential/__init__.py,sha256=qopTKvcMVoTFwyRijeg7rejnG4I684FjUwh70tvhtVM,141
-maleo_foundation/utils/loaders/credential/google.py,sha256=SKsqPuFnAiCcYLf24CxKnMybhVHpgqnq1gGSlThqjts,994
+maleo_foundation/utils/loaders/credential/google.py,sha256=HUcuHD4tXHPt0eHInlFYxA_MDrGSOtbenpd0PX156OM,1255
 maleo_foundation/utils/loaders/key/__init__.py,sha256=hVygcC2ImHc_aVrSrOmyedR8tMUZokWUKCKOSh5ctbo,106
 maleo_foundation/utils/loaders/key/rsa.py,sha256=gDhyX6iTFtHiluuhFCozaZ3pOLKU2Y9TlrNMK_GVyGU,3796
-maleo_foundation-0.2.68.dist-info/METADATA,sha256=So5IYXyl2wFd4nmK_7NKNTrXvNQ6rXFlYXdufF3C5eI,3598
-maleo_foundation-0.2.68.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-maleo_foundation-0.2.68.dist-info/top_level.txt,sha256=_iBos3F_bhEOdjOnzeiEYSrCucasc810xXtLBXI8cQc,17
-maleo_foundation-0.2.68.dist-info/RECORD,,
+maleo_foundation-0.2.70.dist-info/METADATA,sha256=AfgM-gi1MSoGPdCQjAVKP9xJxLJdD-ZfSDV_2xeDB-c,3598
+maleo_foundation-0.2.70.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+maleo_foundation-0.2.70.dist-info/top_level.txt,sha256=_iBos3F_bhEOdjOnzeiEYSrCucasc810xXtLBXI8cQc,17
+maleo_foundation-0.2.70.dist-info/RECORD,,