kiarina-lib-google-cloud-storage 1.6.2__py3-none-any.whl → 1.6.3__py3-none-any.whl

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/_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/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.2.dist-info → kiarina_lib_google_cloud_storage-1.6.3.dist-info}/METADATA

@@ -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.3.dist-info/RECORD

@@ -0,0 +1,9 @@
+kiarina/lib/google/cloud_storage/__init__.py,sha256=q2AdOOOHUj_D-eot8_1-atrIaCKsCg0YatUOdq3kVVE,1184
+kiarina/lib/google/cloud_storage/_get_blob.py,sha256=j74xGy9ZlAFs2EwywQBVACprRcGOU63wd9FKWlE39dk,3065
+kiarina/lib/google/cloud_storage/_get_bucket.py,sha256=1fBIuohwQzpsxaANpVTExQly3smwaYD2wtnDe7yg6Uo,484
+kiarina/lib/google/cloud_storage/_get_storage_client.py,sha256=lmBR2I9_vcyb0PfsiSz0BPFYBwQ6zVci75cmk9GUN5U,359
+kiarina/lib/google/cloud_storage/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+kiarina/lib/google/cloud_storage/settings.py,sha256=vKYeiVRL0qOPCJEbwJfdEUPU8KwpgMLLBzJ3eGpaqOI,536
+kiarina_lib_google_cloud_storage-1.6.3.dist-info/METADATA,sha256=PByhsHVLVhbX9IwQdDhSqSo48ThFkC5H-T7rB2gA6JM,27553
+kiarina_lib_google_cloud_storage-1.6.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+kiarina_lib_google_cloud_storage-1.6.3.dist-info/RECORD,,

kiarina_lib_google_cloud_storage-1.6.2.dist-info/RECORD

@@ -1,9 +0,0 @@
-kiarina/lib/google/cloud_storage/__init__.py,sha256=q2AdOOOHUj_D-eot8_1-atrIaCKsCg0YatUOdq3kVVE,1184
-kiarina/lib/google/cloud_storage/_get_blob.py,sha256=J8GFQIx_xQWgqvd2LscI83u6xmzS7uPBIshyUDgBZEI,2644
-kiarina/lib/google/cloud_storage/_get_bucket.py,sha256=SaGIQqRb9UOJaosGf2pXduAEYscE_T21AHCNTaZtRGo,597
-kiarina/lib/google/cloud_storage/_get_storage_client.py,sha256=lmBR2I9_vcyb0PfsiSz0BPFYBwQ6zVci75cmk9GUN5U,359
-kiarina/lib/google/cloud_storage/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-kiarina/lib/google/cloud_storage/settings.py,sha256=2ZG2AmWe6mM8wq-OHTqSneTIvoraIxh2Q1W7umLOFvI,540
-kiarina_lib_google_cloud_storage-1.6.2.dist-info/METADATA,sha256=y16n-HD2RzseJezOZHujIS4xhzrds78eWEXKJK-p3-E,27462
-kiarina_lib_google_cloud_storage-1.6.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-kiarina_lib_google_cloud_storage-1.6.2.dist-info/RECORD,,