kiarina-lib-google-cloud-storage 1.6.2__tar.gz → 1.6.3__tar.gz

kiarina_lib_google_cloud_storage-1.6.3/.env.sample

@@ -0,0 +1 @@
+KIARINA_LIB_GOOGLE_CLOUD_STORAGE_TEST_SETTINGS_FILE=packages/kiarina-lib-google-cloud-storage/test_settings.yaml

{kiarina_lib_google_cloud_storage-1.6.2 → kiarina_lib_google_cloud_storage-1.6.3}/.gitignore

@@ -25,6 +25,7 @@ htmlcov/
 # Project specific
 *.log
 tmp/
+packages/*/test_settings.yaml
 
 # Test data
 tests/data/large/

{kiarina_lib_google_cloud_storage-1.6.2 → kiarina_lib_google_cloud_storage-1.6.3}/CHANGELOG.md

@@ -7,6 +7,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.6.3] - 2025-10-13
+
+### Changed
+- Converted tests from mock-based to real integration tests with multi-tenancy patterns
+- Simplified test settings loading using `load_user_configs` from pydantic-settings-manager
+- Updated `pydantic-settings-manager` dependency from `>=2.1.0` to `>=2.3.0`
+- Refactored to use `settings_manager.get_settings` instead of deprecated `get_settings_by_key`
+
+### Added
+- Added `.env.sample` and `test_settings.sample.yaml` for easier test setup
+
 ## [1.6.2] - 2025-10-10
 
 ### Changed
@@ -14,7 +25,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - `blob_name_pattern` supports both fixed names and template patterns with placeholders
   - `get_blob()` now accepts `placeholders` parameter for pattern formatting
   - `blob_name` parameter in `get_blob()` now always represents the full blob path
-  - Pattern examples: `"data.json"` (fixed), `"files/{basename}"` (single placeholder), `"web/{user_id}/{agent_id}/files/{basename}"` (multiple placeholders)
+  - Pattern examples: `"data.json"` (fixed), `"files/{basename}"` (single placeholder), `"my-service/{tenant_id}/users/{user_id}/files/{basename}"` (multiple placeholders)
   - Priority: explicit `blob_name` → `blob_name_pattern` with `placeholders` → `blob_name_pattern` without placeholders
   - Enhanced error messages for missing placeholders
 

{kiarina_lib_google_cloud_storage-1.6.2 → kiarina_lib_google_cloud_storage-1.6.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kiarina-lib-google-cloud-storage
-Version: 1.6.2
+Version: 1.6.3
 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
@@ -22,7 +22,7 @@ Classifier: Typing :: Typed
 Requires-Python: >=3.12
 Requires-Dist: google-cloud-storage>=2.19.0
 Requires-Dist: kiarina-lib-google-auth>=1.4.0
-Requires-Dist: pydantic-settings-manager>=2.1.0
+Requires-Dist: pydantic-settings-manager>=2.3.0
 Requires-Dist: pydantic-settings>=2.10.1
 Description-Content-Type: text/markdown
 
@@ -115,18 +115,18 @@ New requirement: Add agent-level isolation for multi-tenancy.
 
 **Updated Security Rules:**
 ```javascript
-match /web/{user_id}/{agent_id}/files/{basename} {
-  allow read, write: if request.auth.uid == user_id 
-                     && request.auth.token.agent_id == agent_id;
+match /my-service/{tenant_id}/users/{user_id}/files/{basename} {
+  allow read, write: if request.auth.uid == user_id
+                     && request.auth.token.tenant_id == tenant_id;
 }
 ```
 
 **Problem**: You must now update **every place** in your application code that constructs these paths:
 ```python
 # Must change all of these
-blob_name = f"web/{user_id}/{agent_id}/files/{file_name}"  # Changed!
-blob_name = f"web/{user_id}/{agent_id}/thumbnails/{file_name}"  # Changed!
-blob_name = f"web/{user_id}/{agent_id}/exports/{file_name}"  # Changed!
+blob_name = f"my-service/{tenant_id}/users/{user_id}/files/{file_name}"  # Changed!
+blob_name = f"my-service/{tenant_id}/users/{user_id}/thumbnails/{file_name}"  # Changed!
+blob_name = f"my-service/{tenant_id}/users/{user_id}/exports/{file_name}"  # Changed!
 # ... and many more
 ```
 
@@ -138,14 +138,14 @@ blob_name = f"web/{user_id}/{agent_id}/exports/{file_name}"  # Changed!
 google_cloud_storage:
   default:
     bucket_name: "my-app-data"
-    blob_name_pattern: "web/{user_id}/{agent_id}/files/{basename}"
+    blob_name_pattern: "my-service/{tenant_id}/users/{user_id}/files/{basename}"
 ```
 
 **GCS Security Rules (Infrastructure Concern):**
 ```javascript
-match /web/{user_id}/{agent_id}/files/{basename} {
-  allow read, write: if request.auth.uid == user_id 
-                     && request.auth.token.agent_id == agent_id;
+match /my-service/{tenant_id}/users/{user_id}/files/{basename} {
+  allow read, write: if request.auth.uid == user_id
+                     && request.auth.token.tenant_id == tenant_id;
 }
 ```
 
@@ -368,14 +368,14 @@ def save_document(tenant_id: str, doc_id: str, content: bytes):
 def list_documents(tenant_id: str) -> list[str]:
     """List documents for any tenant"""
     from kiarina.lib.google.cloud_storage import get_bucket
-    
+
     config_key = f"tenant_{tenant_id}"
     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)
+    settings = settings_manager.get_settings(config_key)
     prefix = f"{settings.blob_name_prefix}/documents/" if settings.blob_name_prefix else "documents/"
-    
+
     blobs = bucket.list_blobs(prefix=prefix)
     return [blob.name for blob in blobs]
 ```
@@ -409,10 +409,10 @@ def mock_storage_config():
 def test_save_user_profile(mock_storage_config):
     """Test user profile saving"""
     from myapp.services import save_user_profile
-    
+
     # Application code uses test configuration automatically
     save_user_profile("user123", {"name": "Alice"})
-    
+
     # Verify using the same configuration
     from kiarina.lib.google.cloud_storage import get_blob
     blob = get_blob(blob_name="users/user123/profile.json")
@@ -428,20 +428,20 @@ from kiarina.lib.google.cloud_storage import settings_manager
 
 def debug_storage_config(config_key: str | None = None):
     """Show actual storage paths for debugging"""
-    settings = settings_manager.get_settings_by_key(config_key)
-    
+    settings = settings_manager.get_settings(config_key)
+
     print(f"Configuration: {config_key or 'default'}")
     print(f"  Bucket: {settings.bucket_name}")
     print(f"  Prefix: {settings.blob_name_prefix or '(none)'}")
     print(f"  Auth: {settings.google_auth_config_key}")
-    
+
     # Example paths
     example_blob = "users/123/profile.json"
     if settings.blob_name_prefix:
         full_path = f"{settings.blob_name_prefix}/{example_blob}"
     else:
         full_path = example_blob
-    
+
     print(f"  Example: gs://{settings.bucket_name}/{full_path}")
 
 # Usage
@@ -665,13 +665,14 @@ blob = get_blob()
 # Actual: gs://bucket/data/fixed.json
 
 # Complex pattern
-# If blob_name_pattern="web/{user_id}/{agent_id}/files/{basename}"
+# If blob_name_pattern="my-service/{tenant_id}/users/{user_id}/files/{basename}"
 blob = get_blob(placeholders={
+    "tenant_id": "tenant123",
     "user_id": "user123",
     "agent_id": "agent456",
     "basename": "document.pdf"
 })
-# Actual: gs://bucket/web/user123/agent456/files/document.pdf
+# Actual: gs://bucket/my-service/tenant123/users/user123/files/document.pdf
 
 # With custom configurations
 blob = get_blob(
@@ -700,7 +701,7 @@ settings_manager: SettingsManager[GoogleCloudStorageSettings]
 - `active_key`: Get/set active configuration key
 
 **Methods:**
-- `get_settings_by_key(key: str)`: Get settings by specific key
+- `get_settings(key: str)`: Get settings by specific key
 - `clear()`: Clear cached settings
 
 ## Common Operations

{kiarina_lib_google_cloud_storage-1.6.2 → kiarina_lib_google_cloud_storage-1.6.3}/README.md

@@ -87,18 +87,18 @@ New requirement: Add agent-level isolation for multi-tenancy.
 
 **Updated Security Rules:**
 ```javascript
-match /web/{user_id}/{agent_id}/files/{basename} {
-  allow read, write: if request.auth.uid == user_id 
-                     && request.auth.token.agent_id == agent_id;
+match /my-service/{tenant_id}/users/{user_id}/files/{basename} {
+  allow read, write: if request.auth.uid == user_id
+                     && request.auth.token.tenant_id == tenant_id;
 }
 ```
 
 **Problem**: You must now update **every place** in your application code that constructs these paths:
 ```python
 # Must change all of these
-blob_name = f"web/{user_id}/{agent_id}/files/{file_name}"  # Changed!
-blob_name = f"web/{user_id}/{agent_id}/thumbnails/{file_name}"  # Changed!
-blob_name = f"web/{user_id}/{agent_id}/exports/{file_name}"  # Changed!
+blob_name = f"my-service/{tenant_id}/users/{user_id}/files/{file_name}"  # Changed!
+blob_name = f"my-service/{tenant_id}/users/{user_id}/thumbnails/{file_name}"  # Changed!
+blob_name = f"my-service/{tenant_id}/users/{user_id}/exports/{file_name}"  # Changed!
 # ... and many more
 ```
 
@@ -110,14 +110,14 @@ blob_name = f"web/{user_id}/{agent_id}/exports/{file_name}"  # Changed!
 google_cloud_storage:
   default:
     bucket_name: "my-app-data"
-    blob_name_pattern: "web/{user_id}/{agent_id}/files/{basename}"
+    blob_name_pattern: "my-service/{tenant_id}/users/{user_id}/files/{basename}"
 ```
 
 **GCS Security Rules (Infrastructure Concern):**
 ```javascript
-match /web/{user_id}/{agent_id}/files/{basename} {
-  allow read, write: if request.auth.uid == user_id 
-                     && request.auth.token.agent_id == agent_id;
+match /my-service/{tenant_id}/users/{user_id}/files/{basename} {
+  allow read, write: if request.auth.uid == user_id
+                     && request.auth.token.tenant_id == tenant_id;
 }
 ```
 
@@ -340,14 +340,14 @@ def save_document(tenant_id: str, doc_id: str, content: bytes):
 def list_documents(tenant_id: str) -> list[str]:
     """List documents for any tenant"""
     from kiarina.lib.google.cloud_storage import get_bucket
-    
+
     config_key = f"tenant_{tenant_id}"
     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)
+    settings = settings_manager.get_settings(config_key)
     prefix = f"{settings.blob_name_prefix}/documents/" if settings.blob_name_prefix else "documents/"
-    
+
     blobs = bucket.list_blobs(prefix=prefix)
     return [blob.name for blob in blobs]
 ```
@@ -381,10 +381,10 @@ def mock_storage_config():
 def test_save_user_profile(mock_storage_config):
     """Test user profile saving"""
     from myapp.services import save_user_profile
-    
+
     # Application code uses test configuration automatically
     save_user_profile("user123", {"name": "Alice"})
-    
+
     # Verify using the same configuration
     from kiarina.lib.google.cloud_storage import get_blob
     blob = get_blob(blob_name="users/user123/profile.json")
@@ -400,20 +400,20 @@ from kiarina.lib.google.cloud_storage import settings_manager
 
 def debug_storage_config(config_key: str | None = None):
     """Show actual storage paths for debugging"""
-    settings = settings_manager.get_settings_by_key(config_key)
-    
+    settings = settings_manager.get_settings(config_key)
+
     print(f"Configuration: {config_key or 'default'}")
     print(f"  Bucket: {settings.bucket_name}")
     print(f"  Prefix: {settings.blob_name_prefix or '(none)'}")
     print(f"  Auth: {settings.google_auth_config_key}")
-    
+
     # Example paths
     example_blob = "users/123/profile.json"
     if settings.blob_name_prefix:
         full_path = f"{settings.blob_name_prefix}/{example_blob}"
     else:
         full_path = example_blob
-    
+
     print(f"  Example: gs://{settings.bucket_name}/{full_path}")
 
 # Usage
@@ -637,13 +637,14 @@ blob = get_blob()
 # Actual: gs://bucket/data/fixed.json
 
 # Complex pattern
-# If blob_name_pattern="web/{user_id}/{agent_id}/files/{basename}"
+# If blob_name_pattern="my-service/{tenant_id}/users/{user_id}/files/{basename}"
 blob = get_blob(placeholders={
+    "tenant_id": "tenant123",
     "user_id": "user123",
     "agent_id": "agent456",
     "basename": "document.pdf"
 })
-# Actual: gs://bucket/web/user123/agent456/files/document.pdf
+# Actual: gs://bucket/my-service/tenant123/users/user123/files/document.pdf
 
 # With custom configurations
 blob = get_blob(
@@ -672,7 +673,7 @@ settings_manager: SettingsManager[GoogleCloudStorageSettings]
 - `active_key`: Get/set active configuration key
 
 **Methods:**
-- `get_settings_by_key(key: str)`: Get settings by specific key
+- `get_settings(key: str)`: Get settings by specific key
 - `clear()`: Clear cached settings
 
 ## Common Operations

{kiarina_lib_google_cloud_storage-1.6.2 → kiarina_lib_google_cloud_storage-1.6.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "kiarina-lib-google-cloud-storage"
-version = "1.6.2"
+version = "1.6.3"
 description = "Google Cloud Storage client library for kiarina namespace"
 readme = "README.md"
 license = "MIT"
@@ -26,7 +26,7 @@ dependencies = [
     "google-cloud-storage>=2.19.0",
     "kiarina-lib-google-auth>=1.4.0",
     "pydantic-settings>=2.10.1",
-    "pydantic-settings-manager>=2.1.0",
+    "pydantic-settings-manager>=2.3.0",
 ]
 
 [project.urls]

{kiarina_lib_google_cloud_storage-1.6.2 → kiarina_lib_google_cloud_storage-1.6.3}/src/kiarina/lib/google/cloud_storage/_get_blob.py

@@ -1,3 +1,4 @@
+import re
 from typing import Any
 
 from google.cloud import storage  # type: ignore[import-untyped]
@@ -38,10 +39,10 @@ def get_blob(
         blob = get_blob(placeholders={"user_id": "123", "basename": "profile.json"})
         # With pattern "users/{user_id}/{basename}" -> "users/123/profile.json"
 
-        # Using default pattern from settings
-        blob = get_blob()  # Uses settings.blob_name_pattern without placeholders
+        # Using fixed pattern from settings (no placeholders)
+        blob = get_blob()  # Uses settings.blob_name_pattern if it has no placeholders
     """
-    settings = settings_manager.get_settings_by_key(config_key)
+    settings = settings_manager.get_settings(config_key)
 
     # Priority 1: Explicit blob_name
     if blob_name is not None:
@@ -65,7 +66,6 @@ def get_blob(
 
     # Priority 3: Default pattern from settings
     elif settings.blob_name_pattern is not None:
-        # Pattern without placeholders (fixed name)
         final_blob_name = settings.blob_name_pattern
 
     else:
@@ -74,5 +74,17 @@ def get_blob(
             "and blob_name_pattern is not set in settings"
         )
 
+    # Safety check: Ensure no unresolved placeholders remain
+    if _has_placeholders(final_blob_name):
+        raise ValueError(
+            f"Unresolved placeholders found in blob name: {final_blob_name}. "
+            f"Please provide placeholders argument to resolve them."
+        )
+
     bucket = get_bucket(config_key, auth_config_key=auth_config_key, **kwargs)
     return bucket.blob(final_blob_name)
+
+
+def _has_placeholders(pattern: str) -> bool:
+    """Check if a pattern contains placeholders like {key}."""
+    return bool(re.search(r"\{[^}]+\}", pattern))

{kiarina_lib_google_cloud_storage-1.6.2 → kiarina_lib_google_cloud_storage-1.6.3}/src/kiarina/lib/google/cloud_storage/_get_bucket.py

@@ -12,10 +12,6 @@ def get_bucket(
     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")
-
+    settings = settings_manager.get_settings(config_key)
     client = get_storage_client(auth_config_key, **kwargs)
     return client.bucket(settings.bucket_name)

{kiarina_lib_google_cloud_storage-1.6.2 → kiarina_lib_google_cloud_storage-1.6.3}/src/kiarina/lib/google/cloud_storage/settings.py

@@ -3,16 +3,16 @@ from pydantic_settings_manager import SettingsManager
 
 
 class GoogleCloudStorageSettings(BaseSettings):
-    bucket_name: str | None = None
+    bucket_name: str
 
     blob_name_pattern: str | None = None
     """
     Blob name pattern with placeholders.
-    
+
     Examples:
         - "data.json" (fixed name)
         - "files/{basename}" (single placeholder)
-        - "web/{user_id}/{agent_id}/files/{basename}" (multiple placeholders)
+        - "my-service/{tenant_id}/users/{user_id}/files/{basename}" (multiple placeholders)
     """
 
 

kiarina_lib_google_cloud_storage-1.6.3/test_settings.sample.yaml

@@ -0,0 +1,15 @@
+kiarina.lib.google.auth:
+  service_account:
+    type: service_account
+    project_id: your-project-id
+    service_account_email: your-service-account@your-project.iam.gserviceaccount.com
+    service_account_file: ~/.gcp/service-account/your-project/your-service-account/key.json
+kiarina.lib.google.cloud_storage:
+  default:
+    bucket_name: your-bucket-name
+    blob_name_pattern: "my-service/{tenant_id}/users/{user_id}/files/{basename}"
+  no_blob_name_pattern:
+    bucket_name: your-bucket-name
+  fixed:
+    bucket_name: your-bucket-name
+    blob_name_pattern: "my-service/kiarina-lib-google-cloud-storage/users/test_get_blob_with_fixed_pattern/files/miineko.png"

kiarina_lib_google_cloud_storage-1.6.3/tests/conftest.py

@@ -0,0 +1,33 @@
+import os
+from pathlib import Path
+
+import pytest
+from pydantic_settings_manager import load_user_configs
+
+import kiarina.utils.file as kf
+
+
+@pytest.fixture
+def data_dir() -> Path:
+    return Path(__file__).parent.parent.parent.parent / "tests" / "data"
+
+
+@pytest.fixture(scope="session")
+def load_settings():
+    env_var = "KIARINA_LIB_GOOGLE_CLOUD_STORAGE_TEST_SETTINGS_FILE"
+
+    if env_var not in os.environ:
+        pytest.skip(f"Environment variable {env_var} not set, skipping tests.")
+
+    test_settings_file = os.environ[env_var]
+    test_settings_file = os.path.expanduser(test_settings_file)
+
+    if not os.path.exists(test_settings_file):
+        raise FileNotFoundError(f"Settings file not found: {test_settings_file}")
+
+    user_configs = kf.read_yaml_dict(test_settings_file)
+
+    if not user_configs:
+        raise ValueError(f"Settings file is empty or invalid: {test_settings_file}")
+
+    load_user_configs(user_configs)

kiarina_lib_google_cloud_storage-1.6.3/tests/test_get_blob.py

@@ -0,0 +1,82 @@
+import pytest
+
+from kiarina.lib.google.cloud_storage import get_blob, settings_manager
+
+
+def test_get_blob_with_blob_name(data_dir, load_settings, request):
+    settings = settings_manager.settings
+
+    assert settings.blob_name_pattern is not None
+
+    blob_name = settings.blob_name_pattern.format(
+        tenant_id="kiarina-lib-google-cloud-storage",
+        user_id=request.node.name,
+        basename="miineko.png",
+    )
+
+    blob = get_blob(blob_name)
+
+    if not blob.exists():
+        blob.upload_from_filename(data_dir / "small" / "miineko_256x256_799b.png")
+
+
+def test_get_blob_with_placeholders(data_dir, load_settings, request):
+    blob = get_blob(
+        placeholders={
+            "tenant_id": "kiarina-lib-google-cloud-storage",
+            "user_id": request.node.name,
+            "basename": "miineko.png",
+        }
+    )
+
+    if not blob.exists():
+        blob.upload_from_filename(data_dir / "small" / "miineko_256x256_799b.png")
+
+
+def test_get_blob_with_placeholders_but_no_pattern(data_dir, load_settings, request):
+    with pytest.raises(
+        ValueError,
+        match="placeholders provided but blob_name_pattern is not set in settings",
+    ):
+        get_blob(
+            placeholders={
+                "user_id": request.node.name,
+                "basename": "miineko.png",
+            },
+            config_key="no_blob_name_pattern",
+        )
+
+
+def test_get_blob_with_not_enough_placeholders(data_dir, load_settings, request):
+    with pytest.raises(
+        ValueError, match="Missing placeholder 'basename' in blob_name_pattern"
+    ):
+        get_blob(
+            placeholders={
+                "tenant_id": "kiarina-lib-google-cloud-storage",
+                "user_id": request.node.name,
+            }
+        )
+
+
+def test_get_blob_with_fixed_pattern(data_dir, load_settings, request):
+    blob = get_blob(config_key="fixed")
+
+    if not blob.exists():
+        blob.upload_from_filename(data_dir / "small" / "miineko_256x256_799b.png")
+
+
+def test_not_enough_placeholders(data_dir, load_settings, request):
+    with pytest.raises(
+        ValueError,
+        match="Unresolved placeholders found in blob name",
+    ):
+        get_blob()
+
+
+def test_no_blob_name_provided(data_dir, load_settings, request):
+    with pytest.raises(
+        ValueError,
+        match="blob_name is not provided, placeholders are not provided, and blob_name_pattern is not set in settings",
+    ):
+        get_blob(config_key="no_blob_name_pattern")

kiarina_lib_google_cloud_storage-1.6.3/tests/test_get_bucket.py

@@ -0,0 +1,18 @@
+from kiarina.lib.google.cloud_storage import get_bucket, settings_manager
+
+
+def test_get_bucket(data_dir, load_settings, request):
+    settings = settings_manager.settings
+    assert settings.blob_name_pattern is not None
+
+    blob_name = settings.blob_name_pattern.format(
+        tenant_id="kiarina-lib-google-cloud-storage",
+        user_id=request.node.name,
+        basename="miineko.png",
+    )
+
+    bucket = get_bucket()
+    blob = bucket.blob(blob_name)
+
+    if not blob.exists():
+        blob.upload_from_filename(data_dir / "small" / "miineko_256x256_799b.png")

kiarina_lib_google_cloud_storage-1.6.3/tests/test_get_storage_client.py

@@ -0,0 +1,20 @@
+from kiarina.lib.google.cloud_storage import settings_manager, get_storage_client
+
+
+def test_get_storage_client(data_dir, load_settings, request):
+    settings = settings_manager.settings
+    assert settings.blob_name_pattern is not None
+
+    bucket_name = settings.bucket_name
+    blob_name = settings.blob_name_pattern.format(
+        tenant_id="kiarina-lib-google-cloud-storage",
+        user_id=request.node.name,
+        basename="miineko.png",
+    )
+
+    client = get_storage_client()
+    bucket = client.bucket(bucket_name)
+    blob = bucket.blob(blob_name)
+
+    if not blob.exists():
+        blob.upload_from_filename(data_dir / "small" / "miineko_256x256_799b.png")

kiarina_lib_google_cloud_storage-1.6.2/tests/test_get_blob.py

@@ -1,224 +0,0 @@
-from unittest.mock import MagicMock, patch
-
-import pytest
-
-from kiarina.lib.google.cloud_storage import get_blob, settings_manager
-
-
-def test_get_blob_with_blob_name():
-    """Test get_blob with explicit blob_name parameter."""
-    settings_manager.user_config = {
-        "default": {
-            "bucket_name": "test-bucket",
-        }
-    }
-
-    mock_bucket = MagicMock()
-    mock_blob = MagicMock()
-    mock_blob.name = "data/file.json"
-    mock_bucket.blob.return_value = mock_blob
-
-    with patch(
-        "kiarina.lib.google.cloud_storage._get_blob.get_bucket",
-        return_value=mock_bucket,
-    ):
-        blob = get_blob(blob_name="data/file.json")
-        assert blob.name == "data/file.json"
-        mock_bucket.blob.assert_called_once_with("data/file.json")
-
-
-def test_get_blob_with_pattern_and_placeholders():
-    """Test get_blob with blob_name_pattern and placeholders."""
-    settings_manager.user_config = {
-        "default": {
-            "bucket_name": "test-bucket",
-            "blob_name_pattern": "users/{user_id}/files/{basename}",
-        }
-    }
-
-    mock_bucket = MagicMock()
-    mock_blob = MagicMock()
-    mock_blob.name = "users/123/files/profile.json"
-    mock_bucket.blob.return_value = mock_blob
-
-    with patch(
-        "kiarina.lib.google.cloud_storage._get_blob.get_bucket",
-        return_value=mock_bucket,
-    ):
-        blob = get_blob(placeholders={"user_id": "123", "basename": "profile.json"})
-        assert blob.name == "users/123/files/profile.json"
-        mock_bucket.blob.assert_called_once_with("users/123/files/profile.json")
-
-
-def test_get_blob_with_fixed_pattern():
-    """Test get_blob with fixed blob_name_pattern (no placeholders)."""
-    settings_manager.user_config = {
-        "default": {
-            "bucket_name": "test-bucket",
-            "blob_name_pattern": "data/fixed.json",
-        }
-    }
-
-    mock_bucket = MagicMock()
-    mock_blob = MagicMock()
-    mock_blob.name = "data/fixed.json"
-    mock_bucket.blob.return_value = mock_blob
-
-    with patch(
-        "kiarina.lib.google.cloud_storage._get_blob.get_bucket",
-        return_value=mock_bucket,
-    ):
-        blob = get_blob()
-        assert blob.name == "data/fixed.json"
-        mock_bucket.blob.assert_called_once_with("data/fixed.json")
-
-
-def test_get_blob_priority_blob_name_over_placeholders():
-    """Test that blob_name takes precedence over placeholders."""
-    settings_manager.user_config = {
-        "default": {
-            "bucket_name": "test-bucket",
-            "blob_name_pattern": "users/{user_id}/files/{basename}",
-        }
-    }
-
-    mock_bucket = MagicMock()
-    mock_blob = MagicMock()
-    mock_blob.name = "direct/path.json"
-    mock_bucket.blob.return_value = mock_blob
-
-    with patch(
-        "kiarina.lib.google.cloud_storage._get_blob.get_bucket",
-        return_value=mock_bucket,
-    ):
-        blob = get_blob(
-            blob_name="direct/path.json",
-            placeholders={"user_id": "123", "basename": "ignored.json"},
-        )
-        assert blob.name == "direct/path.json"
-        mock_bucket.blob.assert_called_once_with("direct/path.json")
-
-
-def test_get_blob_with_missing_placeholder():
-    """Test error when placeholder is missing."""
-    settings_manager.user_config = {
-        "default": {
-            "bucket_name": "test-bucket",
-            "blob_name_pattern": "users/{user_id}/files/{basename}",
-        }
-    }
-
-    with pytest.raises(
-        ValueError,
-        match=r"Missing placeholder 'basename' in blob_name_pattern: "
-        r"users/\{user_id\}/files/\{basename\}",
-    ):
-        get_blob(placeholders={"user_id": "123"})
-
-
-def test_get_blob_without_blob_name_and_pattern():
-    """Test error when neither blob_name nor blob_name_pattern is provided."""
-    settings_manager.user_config = {
-        "default": {
-            "bucket_name": "test-bucket",
-        }
-    }
-
-    with pytest.raises(
-        ValueError,
-        match="blob_name is not provided, placeholders are not provided, "
-        "and blob_name_pattern is not set in settings",
-    ):
-        get_blob()
-
-
-def test_get_blob_with_placeholders_but_no_pattern():
-    """Test error when placeholders are provided but pattern is not set."""
-    settings_manager.user_config = {
-        "default": {
-            "bucket_name": "test-bucket",
-        }
-    }
-
-    with pytest.raises(
-        ValueError,
-        match="placeholders provided but blob_name_pattern is not set in settings",
-    ):
-        get_blob(placeholders={"user_id": "123"})
-
-
-def test_get_blob_with_custom_config_key():
-    """Test get_blob with custom config_key."""
-    settings_manager.user_config = {
-        "custom": {
-            "bucket_name": "custom-bucket",
-            "blob_name_pattern": "custom/path.json",
-        }
-    }
-
-    mock_bucket = MagicMock()
-    mock_blob = MagicMock()
-    mock_blob.name = "custom/path.json"
-    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(config_key="custom")
-        assert blob.name == "custom/path.json"
-        mock_get_bucket.assert_called_once_with("custom", auth_config_key=None)
-
-
-def test_get_blob_with_auth_config_key():
-    """Test get_blob with custom auth_config_key."""
-    settings_manager.user_config = {
-        "default": {
-            "bucket_name": "test-bucket",
-            "blob_name_pattern": "data.json",
-        }
-    }
-
-    mock_bucket = MagicMock()
-    mock_blob = MagicMock()
-    mock_blob.name = "data.json"
-    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 == "data.json"
-        mock_get_bucket.assert_called_once_with(None, auth_config_key="custom_auth")
-
-
-def test_get_blob_with_complex_pattern():
-    """Test get_blob with complex multi-level pattern."""
-    settings_manager.user_config = {
-        "default": {
-            "bucket_name": "test-bucket",
-            "blob_name_pattern": "web/{user_id}/{agent_id}/files/{basename}",
-        }
-    }
-
-    mock_bucket = MagicMock()
-    mock_blob = MagicMock()
-    mock_blob.name = "web/user123/agent456/files/document.pdf"
-    mock_bucket.blob.return_value = mock_blob
-
-    with patch(
-        "kiarina.lib.google.cloud_storage._get_blob.get_bucket",
-        return_value=mock_bucket,
-    ):
-        blob = get_blob(
-            placeholders={
-                "user_id": "user123",
-                "agent_id": "agent456",
-                "basename": "document.pdf",
-            }
-        )
-        assert blob.name == "web/user123/agent456/files/document.pdf"
-        mock_bucket.blob.assert_called_once_with(
-            "web/user123/agent456/files/document.pdf"
-        )

kiarina_lib_google_cloud_storage-1.6.2/tests/test_get_bucket.py

@@ -1,91 +0,0 @@
-from unittest.mock import MagicMock, patch
-
-import pytest
-
-from kiarina.lib.google.cloud_storage import get_bucket, settings_manager
-
-
-def test_get_bucket():
-    # 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()
-        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": {}}
-
-    with pytest.raises(ValueError, match="bucket_name is not set in the settings"):
-        get_bucket()
-
-
-def test_get_bucket_with_custom_config_key():
-    # Setup settings with custom config key
-    settings_manager.user_config = {
-        "custom": {
-            "bucket_name": "custom-bucket",
-        }
-    }
-
-    # Mock get_storage_client and bucket
-    mock_client = MagicMock()
-    mock_bucket = MagicMock()
-    mock_bucket.name = "custom-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(config_key="custom")
-        assert bucket.name == "custom-bucket"
-
-        # 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.2/tests/test_get_storage_client.py

@@ -1,57 +0,0 @@
-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)