kiarina-lib-google-cloud-storage 1.5.0__tar.gz → 1.6.1__tar.gz

{kiarina_lib_google_cloud_storage-1.5.0 → kiarina_lib_google_cloud_storage-1.6.1}/CHANGELOG.md

@@ -7,6 +7,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.6.1] - 2025-10-10
+
+### Changed
+- No changes
+
+## [1.6.0] - 2025-10-10
+
+### Changed
+- **BREAKING**: Separated authentication configuration from storage configuration
+  - Removed `google_auth_config_key` field from `GoogleCloudStorageSettings`
+  - Added `auth_config_key` parameter to `get_storage_client()`, `get_bucket()`, and `get_blob()`
+  - Authentication is now configured separately through kiarina-lib-google-auth
+  - **Migration**: Replace `google_auth_config_key` in settings with `auth_config_key` parameter in function calls
+  - **Rationale**: Clear separation of concerns - storage settings define "where", authentication defines "who"
+  - **Benefits**: More flexible configuration, easier to reuse authentication across different storage configurations
+
 ## [1.5.0] - 2025-10-10
 
 ### Added

{kiarina_lib_google_cloud_storage-1.5.0 → kiarina_lib_google_cloud_storage-1.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kiarina-lib-google-cloud-storage
-Version: 1.5.0
+Version: 1.6.1
 Summary: Google Cloud Storage client library for kiarina namespace
 Project-URL: Homepage, https://github.com/kiarina/kiarina-python
 Project-URL: Repository, https://github.com/kiarina/kiarina-python
@@ -105,7 +105,6 @@ from kiarina.lib.google.cloud_storage import get_blob, settings_manager
 # Configure once (typically in your app initialization)
 settings_manager.user_config = {
     "default": {
-        "google_auth_config_key": "default",
         "bucket_name": "my-app-data",
         "blob_name_prefix": "production/v1"
     }
@@ -126,7 +125,6 @@ content = blob.download_as_text()
 # Set once in your deployment environment
 export KIARINA_LIB_GOOGLE_CLOUD_STORAGE_BUCKET_NAME="my-app-data"
 export KIARINA_LIB_GOOGLE_CLOUD_STORAGE_BLOB_NAME_PREFIX="production/v1"
-export KIARINA_LIB_GOOGLE_CLOUD_STORAGE_GOOGLE_AUTH_CONFIG_KEY="default"
 ```
 
 ```python
@@ -145,23 +143,35 @@ Deploy the same application code to different environments with different config
 
 ```yaml
 # config/production.yaml
+google_auth:
+  default:
+    type: "service_account"
+    service_account_file: "/secrets/prod-sa-key.json"
+
 google_cloud_storage:
   default:
-    google_auth_config_key: "production"
     bucket_name: "prod-us-west1-app-data"
     blob_name_prefix: "v2/production"
 
 # config/staging.yaml
+google_auth:
+  default:
+    type: "service_account"
+    service_account_file: "/secrets/staging-sa-key.json"
+
 google_cloud_storage:
   default:
-    google_auth_config_key: "staging"
     bucket_name: "staging-app-data"
     blob_name_prefix: "v2/staging"
 
 # config/development.yaml
+google_auth:
+  default:
+    type: "user_account"
+    authorized_user_file: "~/.config/gcloud/application_default_credentials.json"
+
 google_cloud_storage:
   default:
-    google_auth_config_key: "development"
     bucket_name: "dev-local-data"
     blob_name_prefix: "v2/dev"
 ```
@@ -193,15 +203,28 @@ Support multiple tenants with isolated storage, without changing application cod
 ```python
 from kiarina.lib.google.cloud_storage import settings_manager, get_blob
 
-# Configure tenant-specific storage
+# Configure tenant-specific storage and authentication
+from kiarina.lib.google.auth import settings_manager as auth_settings_manager
+
+# Authentication configuration (separate from storage)
+auth_settings_manager.user_config = {
+    "tenant_acme": {
+        "type": "service_account",
+        "service_account_file": "/secrets/acme-sa-key.json"
+    },
+    "tenant_globex": {
+        "type": "service_account",
+        "service_account_file": "/secrets/globex-sa-key.json"
+    }
+}
+
+# Storage configuration (separate from authentication)
 settings_manager.user_config = {
     "tenant_acme": {
-        "google_auth_config_key": "tenant_acme",
         "bucket_name": "acme-corp-data",
         "blob_name_prefix": "app-data"
     },
     "tenant_globex": {
-        "google_auth_config_key": "tenant_globex",
         "bucket_name": "globex-data",
         "blob_name_prefix": "app-data"
     }
@@ -211,7 +234,11 @@ settings_manager.user_config = {
 def save_document(tenant_id: str, doc_id: str, content: bytes):
     """Save document for any tenant"""
     config_key = f"tenant_{tenant_id}"
-    blob = get_blob(config_key=config_key, blob_name=f"documents/{doc_id}.pdf")
+    blob = get_blob(
+        blob_name=f"documents/{doc_id}.pdf",
+        config_key=config_key,
+        auth_config_key=config_key
+    )
     blob.upload_from_string(content)
 
 def list_documents(tenant_id: str) -> list[str]:
@@ -219,7 +246,7 @@ def list_documents(tenant_id: str) -> list[str]:
     from kiarina.lib.google.cloud_storage import get_bucket
     
     config_key = f"tenant_{tenant_id}"
-    bucket = get_bucket(config_key=config_key)
+    bucket = get_bucket(config_key=config_key, auth_config_key=config_key)
     
     # Get prefix from settings
     settings = settings_manager.get_settings_by_key(config_key)
@@ -247,7 +274,6 @@ def mock_storage_config():
     """Configure test storage"""
     settings_manager.user_config = {
         "test": {
-            "google_auth_config_key": "test",
             "bucket_name": "test-bucket",
             "blob_name_prefix": f"test-run-{datetime.now().isoformat()}"
         }
@@ -312,13 +338,14 @@ This library uses [pydantic-settings-manager](https://github.com/kiarina/pydanti
 
 | Field | Type | Required | Description |
 |-------|------|----------|-------------|
-| `google_auth_config_key` | `str \| None` | No | Configuration key for kiarina-lib-google-auth |
 | `bucket_name` | `str \| None` | Yes* | Google Cloud Storage bucket name |
 | `blob_name_prefix` | `str \| None` | No | Prefix for blob names (e.g., "production/v1") |
 | `blob_name` | `str \| None` | No | Default blob name (rarely used) |
 
 *Required when using `get_bucket()` or `get_blob()`
 
+**Note:** Authentication is configured separately through `auth_config_key` parameters in the API functions, which reference configurations in [kiarina-lib-google-auth](../kiarina-lib-google-auth/).
+
 ### Configuration Methods
 
 #### 1. Programmatic Configuration
@@ -328,7 +355,6 @@ from kiarina.lib.google.cloud_storage import settings_manager
 
 settings_manager.user_config = {
     "default": {
-        "google_auth_config_key": "default",
         "bucket_name": "my-bucket",
         "blob_name_prefix": "app-data"
     }
@@ -340,11 +366,12 @@ settings_manager.user_config = {
 All settings can be configured via environment variables with the `KIARINA_LIB_GOOGLE_CLOUD_STORAGE_` prefix:
 
 ```bash
-export KIARINA_LIB_GOOGLE_CLOUD_STORAGE_GOOGLE_AUTH_CONFIG_KEY="default"
 export KIARINA_LIB_GOOGLE_CLOUD_STORAGE_BUCKET_NAME="my-bucket"
 export KIARINA_LIB_GOOGLE_CLOUD_STORAGE_BLOB_NAME_PREFIX="app-data"
 ```
 
+**Note:** Authentication is configured separately via `KIARINA_LIB_GOOGLE_AUTH_*` environment variables. See [kiarina-lib-google-auth](../kiarina-lib-google-auth/) for details.
+
 #### 3. Configuration Files (with YAML)
 
 ```python
@@ -360,33 +387,50 @@ settings_manager.user_config = config["google_cloud_storage"]
 
 ### Integration with kiarina-lib-google-auth
 
-This library integrates seamlessly with [kiarina-lib-google-auth](../kiarina-lib-google-auth/) for authentication:
+This library integrates seamlessly with [kiarina-lib-google-auth](../kiarina-lib-google-auth/) for authentication.
+
+**Key Design:** Authentication and storage configurations are **completely separate**, allowing flexible combinations.
 
 ```python
 from kiarina.lib.google.auth import settings_manager as auth_settings_manager
 from kiarina.lib.google.cloud_storage import settings_manager as storage_settings_manager
 
-# Configure authentication
+# Configure authentication (separate)
 auth_settings_manager.user_config = {
     "default": {
         "type": "service_account",
         "service_account_file": "~/service-account-key.json"
+    },
+    "user_auth": {
+        "type": "user_account",
+        "authorized_user_file": "~/.config/gcloud/application_default_credentials.json"
     }
 }
 
-# Configure storage (references auth config)
+# Configure storage (separate)
 storage_settings_manager.user_config = {
     "default": {
-        "google_auth_config_key": "default",  # References auth config above
         "bucket_name": "my-bucket"
+    },
+    "backup": {
+        "bucket_name": "my-backup-bucket"
     }
 }
 
-# Use authenticated storage
+# Use with default authentication
 from kiarina.lib.google.cloud_storage import get_bucket
-bucket = get_bucket()  # Automatically authenticated
+bucket = get_bucket()  # Uses default auth + default storage
+
+# Mix and match configurations
+bucket = get_bucket(config_key="backup", auth_config_key="user_auth")
+# Uses user_auth authentication + backup storage configuration
 ```
 
+**Benefits of Separation:**
+- **Flexibility**: Use same auth with multiple buckets, or multiple auths with same bucket
+- **Clarity**: Clear distinction between "who" (auth) and "where" (storage)
+- **Reusability**: Share authentication across different storage configurations
+
 ## API Reference
 
 ### get_storage_client()
@@ -395,13 +439,13 @@ Get a Google Cloud Storage client with credentials from kiarina-lib-google-auth.
 
 ```python
 def get_storage_client(
-    config_key: str | None = None,
+    auth_config_key: str | None = None,
     **kwargs: Any
 ) -> storage.Client
 ```
 
 **Parameters:**
-- `config_key`: Configuration key to use (default: None uses active key)
+- `auth_config_key`: Configuration key for kiarina-lib-google-auth (default: None uses active key)
 - `**kwargs`: Additional arguments passed to `storage.Client()`
 
 **Returns:**
@@ -410,7 +454,7 @@ def get_storage_client(
 **Example:**
 ```python
 client = get_storage_client()
-client = get_storage_client(config_key="production")
+client = get_storage_client(auth_config_key="production")
 client = get_storage_client(project="my-project")  # Override project
 ```
 
@@ -421,12 +465,15 @@ Get a Google Cloud Storage bucket.
 ```python
 def get_bucket(
     config_key: str | None = None,
+    *,
+    auth_config_key: str | None = None,
     **kwargs: Any
 ) -> storage.Bucket
 ```
 
 **Parameters:**
-- `config_key`: Configuration key to use (default: None uses active key)
+- `config_key`: Configuration key for storage settings (default: None uses active key)
+- `auth_config_key`: Configuration key for authentication (default: None uses active key)
 - `**kwargs`: Additional arguments passed to `get_storage_client()`
 
 **Returns:**
@@ -439,6 +486,7 @@ def get_bucket(
 ```python
 bucket = get_bucket()
 bucket = get_bucket(config_key="production")
+bucket = get_bucket(config_key="production", auth_config_key="prod_auth")
 
 # Use native google-cloud-storage API
 for blob in bucket.list_blobs(prefix="users/"):
@@ -451,15 +499,18 @@ Get a Google Cloud Storage blob.
 
 ```python
 def get_blob(
-    config_key: str | None = None,
     blob_name: str | None = None,
+    *,
+    config_key: str | None = None,
+    auth_config_key: str | None = None,
     **kwargs: Any
 ) -> storage.Blob
 ```
 
 **Parameters:**
-- `config_key`: Configuration key to use (default: None uses active key)
 - `blob_name`: Blob name (default: None uses settings.blob_name)
+- `config_key`: Configuration key for storage settings (default: None uses active key)
+- `auth_config_key`: Configuration key for authentication (default: None uses active key)
 - `**kwargs`: Additional arguments passed to `get_bucket()`
 
 **Returns:**
@@ -478,6 +529,13 @@ blob = get_blob(blob_name="data.json")
 # Actual blob name will be "production/v1/data.json"
 blob = get_blob(blob_name="data.json")
 
+# With custom configurations
+blob = get_blob(
+    blob_name="data.json",
+    config_key="production",
+    auth_config_key="prod_auth"
+)
+
 # Use native google-cloud-storage API
 blob.upload_from_string("content")
 content = blob.download_as_text()

{kiarina_lib_google_cloud_storage-1.5.0 → kiarina_lib_google_cloud_storage-1.6.1}/README.md

@@ -77,7 +77,6 @@ from kiarina.lib.google.cloud_storage import get_blob, settings_manager
 # Configure once (typically in your app initialization)
 settings_manager.user_config = {
     "default": {
-        "google_auth_config_key": "default",
         "bucket_name": "my-app-data",
         "blob_name_prefix": "production/v1"
     }
@@ -98,7 +97,6 @@ content = blob.download_as_text()
 # Set once in your deployment environment
 export KIARINA_LIB_GOOGLE_CLOUD_STORAGE_BUCKET_NAME="my-app-data"
 export KIARINA_LIB_GOOGLE_CLOUD_STORAGE_BLOB_NAME_PREFIX="production/v1"
-export KIARINA_LIB_GOOGLE_CLOUD_STORAGE_GOOGLE_AUTH_CONFIG_KEY="default"
 ```
 
 ```python
@@ -117,23 +115,35 @@ Deploy the same application code to different environments with different config
 
 ```yaml
 # config/production.yaml
+google_auth:
+  default:
+    type: "service_account"
+    service_account_file: "/secrets/prod-sa-key.json"
+
 google_cloud_storage:
   default:
-    google_auth_config_key: "production"
     bucket_name: "prod-us-west1-app-data"
     blob_name_prefix: "v2/production"
 
 # config/staging.yaml
+google_auth:
+  default:
+    type: "service_account"
+    service_account_file: "/secrets/staging-sa-key.json"
+
 google_cloud_storage:
   default:
-    google_auth_config_key: "staging"
     bucket_name: "staging-app-data"
     blob_name_prefix: "v2/staging"
 
 # config/development.yaml
+google_auth:
+  default:
+    type: "user_account"
+    authorized_user_file: "~/.config/gcloud/application_default_credentials.json"
+
 google_cloud_storage:
   default:
-    google_auth_config_key: "development"
     bucket_name: "dev-local-data"
     blob_name_prefix: "v2/dev"
 ```
@@ -165,15 +175,28 @@ Support multiple tenants with isolated storage, without changing application cod
 ```python
 from kiarina.lib.google.cloud_storage import settings_manager, get_blob
 
-# Configure tenant-specific storage
+# Configure tenant-specific storage and authentication
+from kiarina.lib.google.auth import settings_manager as auth_settings_manager
+
+# Authentication configuration (separate from storage)
+auth_settings_manager.user_config = {
+    "tenant_acme": {
+        "type": "service_account",
+        "service_account_file": "/secrets/acme-sa-key.json"
+    },
+    "tenant_globex": {
+        "type": "service_account",
+        "service_account_file": "/secrets/globex-sa-key.json"
+    }
+}
+
+# Storage configuration (separate from authentication)
 settings_manager.user_config = {
     "tenant_acme": {
-        "google_auth_config_key": "tenant_acme",
         "bucket_name": "acme-corp-data",
         "blob_name_prefix": "app-data"
     },
     "tenant_globex": {
-        "google_auth_config_key": "tenant_globex",
         "bucket_name": "globex-data",
         "blob_name_prefix": "app-data"
     }
@@ -183,7 +206,11 @@ settings_manager.user_config = {
 def save_document(tenant_id: str, doc_id: str, content: bytes):
     """Save document for any tenant"""
     config_key = f"tenant_{tenant_id}"
-    blob = get_blob(config_key=config_key, blob_name=f"documents/{doc_id}.pdf")
+    blob = get_blob(
+        blob_name=f"documents/{doc_id}.pdf",
+        config_key=config_key,
+        auth_config_key=config_key
+    )
     blob.upload_from_string(content)
 
 def list_documents(tenant_id: str) -> list[str]:
@@ -191,7 +218,7 @@ def list_documents(tenant_id: str) -> list[str]:
     from kiarina.lib.google.cloud_storage import get_bucket
     
     config_key = f"tenant_{tenant_id}"
-    bucket = get_bucket(config_key=config_key)
+    bucket = get_bucket(config_key=config_key, auth_config_key=config_key)
     
     # Get prefix from settings
     settings = settings_manager.get_settings_by_key(config_key)
@@ -219,7 +246,6 @@ def mock_storage_config():
     """Configure test storage"""
     settings_manager.user_config = {
         "test": {
-            "google_auth_config_key": "test",
             "bucket_name": "test-bucket",
             "blob_name_prefix": f"test-run-{datetime.now().isoformat()}"
         }
@@ -284,13 +310,14 @@ This library uses [pydantic-settings-manager](https://github.com/kiarina/pydanti
 
 | Field | Type | Required | Description |
 |-------|------|----------|-------------|
-| `google_auth_config_key` | `str \| None` | No | Configuration key for kiarina-lib-google-auth |
 | `bucket_name` | `str \| None` | Yes* | Google Cloud Storage bucket name |
 | `blob_name_prefix` | `str \| None` | No | Prefix for blob names (e.g., "production/v1") |
 | `blob_name` | `str \| None` | No | Default blob name (rarely used) |
 
 *Required when using `get_bucket()` or `get_blob()`
 
+**Note:** Authentication is configured separately through `auth_config_key` parameters in the API functions, which reference configurations in [kiarina-lib-google-auth](../kiarina-lib-google-auth/).
+
 ### Configuration Methods
 
 #### 1. Programmatic Configuration
@@ -300,7 +327,6 @@ from kiarina.lib.google.cloud_storage import settings_manager
 
 settings_manager.user_config = {
     "default": {
-        "google_auth_config_key": "default",
         "bucket_name": "my-bucket",
         "blob_name_prefix": "app-data"
     }
@@ -312,11 +338,12 @@ settings_manager.user_config = {
 All settings can be configured via environment variables with the `KIARINA_LIB_GOOGLE_CLOUD_STORAGE_` prefix:
 
 ```bash
-export KIARINA_LIB_GOOGLE_CLOUD_STORAGE_GOOGLE_AUTH_CONFIG_KEY="default"
 export KIARINA_LIB_GOOGLE_CLOUD_STORAGE_BUCKET_NAME="my-bucket"
 export KIARINA_LIB_GOOGLE_CLOUD_STORAGE_BLOB_NAME_PREFIX="app-data"
 ```
 
+**Note:** Authentication is configured separately via `KIARINA_LIB_GOOGLE_AUTH_*` environment variables. See [kiarina-lib-google-auth](../kiarina-lib-google-auth/) for details.
+
 #### 3. Configuration Files (with YAML)
 
 ```python
@@ -332,33 +359,50 @@ settings_manager.user_config = config["google_cloud_storage"]
 
 ### Integration with kiarina-lib-google-auth
 
-This library integrates seamlessly with [kiarina-lib-google-auth](../kiarina-lib-google-auth/) for authentication:
+This library integrates seamlessly with [kiarina-lib-google-auth](../kiarina-lib-google-auth/) for authentication.
+
+**Key Design:** Authentication and storage configurations are **completely separate**, allowing flexible combinations.
 
 ```python
 from kiarina.lib.google.auth import settings_manager as auth_settings_manager
 from kiarina.lib.google.cloud_storage import settings_manager as storage_settings_manager
 
-# Configure authentication
+# Configure authentication (separate)
 auth_settings_manager.user_config = {
     "default": {
         "type": "service_account",
         "service_account_file": "~/service-account-key.json"
+    },
+    "user_auth": {
+        "type": "user_account",
+        "authorized_user_file": "~/.config/gcloud/application_default_credentials.json"
     }
 }
 
-# Configure storage (references auth config)
+# Configure storage (separate)
 storage_settings_manager.user_config = {
     "default": {
-        "google_auth_config_key": "default",  # References auth config above
         "bucket_name": "my-bucket"
+    },
+    "backup": {
+        "bucket_name": "my-backup-bucket"
     }
 }
 
-# Use authenticated storage
+# Use with default authentication
 from kiarina.lib.google.cloud_storage import get_bucket
-bucket = get_bucket()  # Automatically authenticated
+bucket = get_bucket()  # Uses default auth + default storage
+
+# Mix and match configurations
+bucket = get_bucket(config_key="backup", auth_config_key="user_auth")
+# Uses user_auth authentication + backup storage configuration
 ```
 
+**Benefits of Separation:**
+- **Flexibility**: Use same auth with multiple buckets, or multiple auths with same bucket
+- **Clarity**: Clear distinction between "who" (auth) and "where" (storage)
+- **Reusability**: Share authentication across different storage configurations
+
 ## API Reference
 
 ### get_storage_client()
@@ -367,13 +411,13 @@ Get a Google Cloud Storage client with credentials from kiarina-lib-google-auth.
 
 ```python
 def get_storage_client(
-    config_key: str | None = None,
+    auth_config_key: str | None = None,
     **kwargs: Any
 ) -> storage.Client
 ```
 
 **Parameters:**
-- `config_key`: Configuration key to use (default: None uses active key)
+- `auth_config_key`: Configuration key for kiarina-lib-google-auth (default: None uses active key)
 - `**kwargs`: Additional arguments passed to `storage.Client()`
 
 **Returns:**
@@ -382,7 +426,7 @@ def get_storage_client(
 **Example:**
 ```python
 client = get_storage_client()
-client = get_storage_client(config_key="production")
+client = get_storage_client(auth_config_key="production")
 client = get_storage_client(project="my-project")  # Override project
 ```
 
@@ -393,12 +437,15 @@ Get a Google Cloud Storage bucket.
 ```python
 def get_bucket(
     config_key: str | None = None,
+    *,
+    auth_config_key: str | None = None,
     **kwargs: Any
 ) -> storage.Bucket
 ```
 
 **Parameters:**
-- `config_key`: Configuration key to use (default: None uses active key)
+- `config_key`: Configuration key for storage settings (default: None uses active key)
+- `auth_config_key`: Configuration key for authentication (default: None uses active key)
 - `**kwargs`: Additional arguments passed to `get_storage_client()`
 
 **Returns:**
@@ -411,6 +458,7 @@ def get_bucket(
 ```python
 bucket = get_bucket()
 bucket = get_bucket(config_key="production")
+bucket = get_bucket(config_key="production", auth_config_key="prod_auth")
 
 # Use native google-cloud-storage API
 for blob in bucket.list_blobs(prefix="users/"):
@@ -423,15 +471,18 @@ Get a Google Cloud Storage blob.
 
 ```python
 def get_blob(
-    config_key: str | None = None,
     blob_name: str | None = None,
+    *,
+    config_key: str | None = None,
+    auth_config_key: str | None = None,
     **kwargs: Any
 ) -> storage.Blob
 ```
 
 **Parameters:**
-- `config_key`: Configuration key to use (default: None uses active key)
 - `blob_name`: Blob name (default: None uses settings.blob_name)
+- `config_key`: Configuration key for storage settings (default: None uses active key)
+- `auth_config_key`: Configuration key for authentication (default: None uses active key)
 - `**kwargs`: Additional arguments passed to `get_bucket()`
 
 **Returns:**
@@ -450,6 +501,13 @@ blob = get_blob(blob_name="data.json")
 # Actual blob name will be "production/v1/data.json"
 blob = get_blob(blob_name="data.json")
 
+# With custom configurations
+blob = get_blob(
+    blob_name="data.json",
+    config_key="production",
+    auth_config_key="prod_auth"
+)
+
 # Use native google-cloud-storage API
 blob.upload_from_string("content")
 content = blob.download_as_text()

{kiarina_lib_google_cloud_storage-1.5.0 → kiarina_lib_google_cloud_storage-1.6.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "kiarina-lib-google-cloud-storage"
-version = "1.5.0"
+version = "1.6.1"
 description = "Google Cloud Storage client library for kiarina namespace"
 readme = "README.md"
 license = "MIT"

{kiarina_lib_google_cloud_storage-1.5.0 → kiarina_lib_google_cloud_storage-1.6.1}/src/kiarina/lib/google/cloud_storage/_get_blob.py

@@ -7,7 +7,11 @@ from .settings import settings_manager
 
 
 def get_blob(
-    config_key: str | None = None, blob_name: str | None = None, **kwargs: Any
+    blob_name: str | None = None,
+    *,
+    config_key: str | None = None,
+    auth_config_key: str | None = None,
+    **kwargs: Any,
 ) -> storage.Blob:
     settings = settings_manager.get_settings_by_key(config_key)
 
@@ -20,5 +24,5 @@ def get_blob(
     if settings.blob_name_prefix:
         blob_name = f"{settings.blob_name_prefix}/{blob_name}"
 
-    bucket = get_bucket(config_key, **kwargs)
+    bucket = get_bucket(config_key, auth_config_key=auth_config_key, **kwargs)
     return bucket.blob(blob_name)

{kiarina_lib_google_cloud_storage-1.5.0 → kiarina_lib_google_cloud_storage-1.6.1}/src/kiarina/lib/google/cloud_storage/_get_bucket.py

@@ -6,11 +6,16 @@ from ._get_storage_client import get_storage_client
 from .settings import settings_manager
 
 
-def get_bucket(config_key: str | None = None, **kwargs: Any) -> storage.Bucket:
+def get_bucket(
+    config_key: str | None = None,
+    *,
+    auth_config_key: str | None = None,
+    **kwargs: Any,
+) -> storage.Bucket:
     settings = settings_manager.get_settings_by_key(config_key)
 
     if settings.bucket_name is None:
         raise ValueError("bucket_name is not set in the settings")
 
-    client = get_storage_client(config_key, **kwargs)
+    client = get_storage_client(auth_config_key, **kwargs)
     return client.bucket(settings.bucket_name)

kiarina_lib_google_cloud_storage-1.6.1/src/kiarina/lib/google/cloud_storage/_get_storage_client.py

@@ -0,0 +1,12 @@
+from typing import Any
+
+from google.cloud import storage  # type: ignore[import-untyped]
+from kiarina.lib.google.auth import get_credentials
+
+
+def get_storage_client(
+    auth_config_key: str | None = None,
+    **kwargs: Any,
+) -> storage.Client:
+    credentials = get_credentials(auth_config_key)
+    return storage.Client(credentials=credentials, **kwargs)

{kiarina_lib_google_cloud_storage-1.5.0 → kiarina_lib_google_cloud_storage-1.6.1}/src/kiarina/lib/google/cloud_storage/settings.py

@@ -3,8 +3,6 @@ from pydantic_settings_manager import SettingsManager
 
 
 class GoogleCloudStorageSettings(BaseSettings):
-    google_auth_config_key: str | None = None
-
     bucket_name: str | None = None
 
     blob_name_prefix: str | None = None

{kiarina_lib_google_cloud_storage-1.5.0 → kiarina_lib_google_cloud_storage-1.6.1}/tests/test_get_blob.py

@@ -9,7 +9,6 @@ def test_get_blob():
     # Setup settings
     settings_manager.user_config = {
         "default": {
-            "google_auth_config_key": "test_auth",
             "bucket_name": "test-bucket",
             "blob_name": "test-blob.txt",
         }
@@ -36,7 +35,6 @@ def test_get_blob_with_blob_name_parameter():
     # Setup settings
     settings_manager.user_config = {
         "default": {
-            "google_auth_config_key": "test_auth",
             "bucket_name": "test-bucket",
         }
     }
@@ -62,7 +60,6 @@ def test_get_blob_with_blob_name_prefix():
     # Setup settings with blob_name_prefix
     settings_manager.user_config = {
         "default": {
-            "google_auth_config_key": "test_auth",
             "bucket_name": "test-bucket",
             "blob_name_prefix": "prefix",
             "blob_name": "test-blob.txt",
@@ -90,7 +87,6 @@ def test_get_blob_with_blob_name_prefix_and_parameter():
     # Setup settings with blob_name_prefix
     settings_manager.user_config = {
         "default": {
-            "google_auth_config_key": "test_auth",
             "bucket_name": "test-bucket",
             "blob_name_prefix": "prefix",
         }
@@ -117,7 +113,6 @@ def test_get_blob_without_blob_name():
     # Setup settings without blob_name
     settings_manager.user_config = {
         "default": {
-            "google_auth_config_key": "test_auth",
             "bucket_name": "test-bucket",
         }
     }
@@ -132,7 +127,6 @@ def test_get_blob_with_custom_config_key():
     # Setup settings with custom config key
     settings_manager.user_config = {
         "custom": {
-            "google_auth_config_key": "custom_auth",
             "bucket_name": "custom-bucket",
             "blob_name": "custom-blob.txt",
         }
@@ -151,5 +145,31 @@ def test_get_blob_with_custom_config_key():
         blob = get_blob(config_key="custom")
         assert blob.name == "custom-blob.txt"
 
-        # Verify get_bucket was called with custom config key
-        mock_get_bucket.assert_called_once_with("custom")
+        # Verify get_bucket was called with custom config key and no auth_config_key
+        mock_get_bucket.assert_called_once_with("custom", auth_config_key=None)
+
+
+def test_get_blob_with_auth_config_key():
+    # Setup settings
+    settings_manager.user_config = {
+        "default": {
+            "bucket_name": "test-bucket",
+            "blob_name": "test-blob.txt",
+        }
+    }
+
+    # Mock get_bucket and blob
+    mock_bucket = MagicMock()
+    mock_blob = MagicMock()
+    mock_blob.name = "test-blob.txt"
+    mock_bucket.blob.return_value = mock_blob
+
+    with patch(
+        "kiarina.lib.google.cloud_storage._get_blob.get_bucket",
+        return_value=mock_bucket,
+    ) as mock_get_bucket:
+        blob = get_blob(auth_config_key="custom_auth")
+        assert blob.name == "test-blob.txt"
+
+        # Verify get_bucket was called with custom auth config key
+        mock_get_bucket.assert_called_once_with(None, auth_config_key="custom_auth")

{kiarina_lib_google_cloud_storage-1.5.0 → kiarina_lib_google_cloud_storage-1.6.1}/tests/test_get_bucket.py

@@ -9,7 +9,6 @@ def test_get_bucket():
     # Setup settings
     settings_manager.user_config = {
         "default": {
-            "google_auth_config_key": "test_auth",
             "bucket_name": "test-bucket",
         }
     }
@@ -23,21 +22,20 @@ def test_get_bucket():
     with patch(
         "kiarina.lib.google.cloud_storage._get_bucket.get_storage_client",
         return_value=mock_client,
-    ):
+    ) as mock_get_client:
         bucket = get_bucket()
         assert bucket.name == "test-bucket"
 
+        # Verify get_storage_client was called with None (default)
+        mock_get_client.assert_called_once_with(None)
+
         # Verify bucket was called with correct bucket name
         mock_client.bucket.assert_called_once_with("test-bucket")
 
 
 def test_get_bucket_without_bucket_name():
     # Setup settings without bucket_name
-    settings_manager.user_config = {
-        "default": {
-            "google_auth_config_key": "test_auth",
-        }
-    }
+    settings_manager.user_config = {"default": {}}
 
     with pytest.raises(ValueError, match="bucket_name is not set in the settings"):
         get_bucket()
@@ -47,7 +45,6 @@ def test_get_bucket_with_custom_config_key():
     # Setup settings with custom config key
     settings_manager.user_config = {
         "custom": {
-            "google_auth_config_key": "custom_auth",
             "bucket_name": "custom-bucket",
         }
     }
@@ -65,5 +62,30 @@ def test_get_bucket_with_custom_config_key():
         bucket = get_bucket(config_key="custom")
         assert bucket.name == "custom-bucket"
 
-        # Verify get_storage_client was called with custom config key
-        mock_get_client.assert_called_once_with("custom")
+        # Verify get_storage_client was called with None (no auth_config_key specified)
+        mock_get_client.assert_called_once_with(None)
+
+
+def test_get_bucket_with_auth_config_key():
+    # Setup settings
+    settings_manager.user_config = {
+        "default": {
+            "bucket_name": "test-bucket",
+        }
+    }
+
+    # Mock get_storage_client and bucket
+    mock_client = MagicMock()
+    mock_bucket = MagicMock()
+    mock_bucket.name = "test-bucket"
+    mock_client.bucket.return_value = mock_bucket
+
+    with patch(
+        "kiarina.lib.google.cloud_storage._get_bucket.get_storage_client",
+        return_value=mock_client,
+    ) as mock_get_client:
+        bucket = get_bucket(auth_config_key="custom_auth")
+        assert bucket.name == "test-bucket"
+
+        # Verify get_storage_client was called with custom auth config key
+        mock_get_client.assert_called_once_with("custom_auth")

kiarina_lib_google_cloud_storage-1.6.1/tests/test_get_storage_client.py

@@ -0,0 +1,57 @@
+from unittest.mock import MagicMock, patch
+
+from kiarina.lib.google.cloud_storage import get_storage_client
+
+
+def test_get_storage_client():
+    # Mock get_credentials and storage.Client
+    mock_credentials = MagicMock()
+    mock_credentials.project_id = "test-project"
+    mock_client = MagicMock()
+    mock_client.project = "test-project"
+
+    with (
+        patch(
+            "kiarina.lib.google.cloud_storage._get_storage_client.get_credentials",
+            return_value=mock_credentials,
+        ) as mock_get_credentials,
+        patch(
+            "kiarina.lib.google.cloud_storage._get_storage_client.storage.Client",
+            return_value=mock_client,
+        ) as mock_client_class,
+    ):
+        client = get_storage_client()
+        assert client.project == "test-project"
+
+        # Verify get_credentials was called with None (default)
+        mock_get_credentials.assert_called_once_with(None)
+
+        # Verify Client was called with correct credentials
+        mock_client_class.assert_called_once_with(credentials=mock_credentials)
+
+
+def test_get_storage_client_with_auth_config_key():
+    # Mock get_credentials and storage.Client
+    mock_credentials = MagicMock()
+    mock_credentials.project_id = "custom-project"
+    mock_client = MagicMock()
+    mock_client.project = "custom-project"
+
+    with (
+        patch(
+            "kiarina.lib.google.cloud_storage._get_storage_client.get_credentials",
+            return_value=mock_credentials,
+        ) as mock_get_credentials,
+        patch(
+            "kiarina.lib.google.cloud_storage._get_storage_client.storage.Client",
+            return_value=mock_client,
+        ) as mock_client_class,
+    ):
+        client = get_storage_client(auth_config_key="custom_auth")
+        assert client.project == "custom-project"
+
+        # Verify get_credentials was called with custom auth config key
+        mock_get_credentials.assert_called_once_with("custom_auth")
+
+        # Verify Client was called with correct credentials
+        mock_client_class.assert_called_once_with(credentials=mock_credentials)

kiarina_lib_google_cloud_storage-1.5.0/src/kiarina/lib/google/cloud_storage/_get_storage_client.py

@@ -1,12 +0,0 @@
-from typing import Any
-
-from google.cloud import storage  # type: ignore[import-untyped]
-from kiarina.lib.google.auth import get_credentials
-
-from .settings import settings_manager
-
-
-def get_storage_client(config_key: str | None = None, **kwargs: Any) -> storage.Client:
-    settings = settings_manager.get_settings_by_key(config_key)
-    credentials = get_credentials(settings.google_auth_config_key)
-    return storage.Client(credentials=credentials, **kwargs)

kiarina_lib_google_cloud_storage-1.5.0/tests/test_get_storage_client.py

@@ -1,34 +0,0 @@
-from unittest.mock import MagicMock, patch
-
-from kiarina.lib.google.cloud_storage import get_storage_client, settings_manager
-
-
-def test_get_storage_client():
-    # Setup settings
-    settings_manager.user_config = {
-        "default": {
-            "google_auth_config_key": "test_auth",
-        }
-    }
-
-    # Mock get_credentials and storage.Client
-    mock_credentials = MagicMock()
-    mock_credentials.project_id = "test-project"
-    mock_client = MagicMock()
-    mock_client.project = "test-project"
-
-    with (
-        patch(
-            "kiarina.lib.google.cloud_storage._get_storage_client.get_credentials",
-            return_value=mock_credentials,
-        ),
-        patch(
-            "kiarina.lib.google.cloud_storage._get_storage_client.storage.Client",
-            return_value=mock_client,
-        ) as mock_client_class,
-    ):
-        client = get_storage_client()
-        assert client.project == "test-project"
-
-        # Verify Client was called with correct credentials
-        mock_client_class.assert_called_once_with(credentials=mock_credentials)