geek-cafe-saas-sdk 0.7.5__py3-none-any.whl → 0.8.0__py3-none-any.whl

geek_cafe_saas_sdk/domains/files/handlers/files/get/app.py

@@ -17,7 +17,7 @@ handler_wrapper = create_handler(
 )
 
 
-def handler(event: Dict[str, Any], context: Any, injected_service=None) -> Dict[str, Any]:
+def lambda_handler(event: Dict[str, Any], context: Any, injected_service=None) -> Dict[str, Any]:
     """
     Get file metadata by ID.
     

geek_cafe_saas_sdk/domains/files/handlers/files/list/app.py

@@ -17,7 +17,7 @@ handler_wrapper = create_handler(
 )
 
 
-def handler(event: Dict[str, Any], context: Any, injected_service=None) -> Dict[str, Any]:
+def lambda_handler(event: Dict[str, Any], context: Any, injected_service=None) -> Dict[str, Any]:
     """
     List files.
     

geek_cafe_saas_sdk/domains/files/handlers/lineage/create_derived/app.py

@@ -18,7 +18,7 @@ handler_wrapper = create_handler(
 )
 
 
-def handler(event: Dict[str, Any], context: Any, injected_service=None) -> Dict[str, Any]:
+def lambda_handler(event: Dict[str, Any], context: Any, injected_service=None) -> Dict[str, Any]:
     """
     Create a derived file from a main file (e.g., data cleaning).
     

geek_cafe_saas_sdk/domains/files/handlers/lineage/create_main/app.py

@@ -18,7 +18,7 @@ handler_wrapper = create_handler(
 )
 
 
-def handler(event: Dict[str, Any], context: Any, injected_service=None) -> Dict[str, Any]:
+def lambda_handler(event: Dict[str, Any], context: Any, injected_service=None) -> Dict[str, Any]:
     """
     Create a main file from an original file (e.g., XLS → CSV conversion).
     

geek_cafe_saas_sdk/domains/files/handlers/lineage/download_bundle/app.py

@@ -18,7 +18,7 @@ handler_wrapper = create_handler(
 )
 
 
-def handler(event: Dict[str, Any], context: Any, injected_service=None) -> Dict[str, Any]:
+def lambda_handler(event: Dict[str, Any], context: Any, injected_service=None) -> Dict[str, Any]:
     """
     Download complete lineage bundle with file content.
     

geek_cafe_saas_sdk/domains/files/handlers/lineage/get_lineage/app.py

@@ -17,7 +17,7 @@ handler_wrapper = create_handler(
 )
 
 
-def handler(event: Dict[str, Any], context: Any, injected_service=None) -> Dict[str, Any]:
+def lambda_handler(event: Dict[str, Any], context: Any, injected_service=None) -> Dict[str, Any]:
     """
     Get complete lineage for a file.
     

geek_cafe_saas_sdk/domains/files/handlers/lineage/prepare_bundle/app.py

@@ -17,7 +17,7 @@ handler_wrapper = create_handler(
 )
 
 
-def handler(event: Dict[str, Any], context: Any, injected_service=None) -> Dict[str, Any]:
+def lambda_handler(event: Dict[str, Any], context: Any, injected_service=None) -> Dict[str, Any]:
     """
     Prepare lineage bundle for a file (metadata only, no file content).
     

geek_cafe_saas_sdk/domains/files/models/file.py

@@ -103,16 +103,14 @@ class File(BaseModel):
         primary.sort_key.value = lambda: "metadata"
         self.indexes.add_primary(primary)
         
-        # GSI1: Files by directory
+        # GSI1: Files by directory (id)
         gsi = DynamoDBIndex()
         gsi.name = "gsi1"
         gsi.partition_key.attribute_name = f"{gsi.name}_pk"
         gsi.partition_key.value = lambda: DynamoDBKey.build_key(("tenant", self.tenant_id))
-        gsi.sort_key.attribute_name = f"{gsi.name}_sk"
-        if self.directory_id:
-            gsi.sort_key.value = lambda: DynamoDBKey.build_key(("directory", self.directory_id), ("file", self.file_name))
-        else:
-            gsi.sort_key.value = lambda: DynamoDBKey.build_key(("root", "file"), ("name", self.file_name))
+        gsi.sort_key.attribute_name = f"{gsi.name}_sk"        
+        gsi.sort_key.value = lambda: DynamoDBKey.build_key(("directory", self.directory_id), ("file", self.file_name))
+        
         self.indexes.add_secondary(gsi)
         
         # GSI2: Files by owner
@@ -123,6 +121,18 @@ class File(BaseModel):
         gsi.sort_key.attribute_name = f"{gsi.name}_sk"
         gsi.sort_key.value = lambda: DynamoDBKey.build_key(("file", self.created_utc_ts))
         self.indexes.add_secondary(gsi)
+
+
+
+        # GSI3: Files by directory (virtual path)
+        gsi = DynamoDBIndex()
+        gsi.name = "gsi3"
+        gsi.partition_key.attribute_name = f"{gsi.name}_pk"
+        gsi.partition_key.value = lambda: DynamoDBKey.build_key(("tenant", self.tenant_id))
+        gsi.sort_key.attribute_name = f"{gsi.name}_sk"        
+        gsi.sort_key.value = lambda: DynamoDBKey.build_key(("directory", self.virtual_path), ("file", self.file_name))
+        
+        self.indexes.add_secondary(gsi)
     
     # Properties - File Identity (alias for BaseModel.id)
     @property

geek_cafe_saas_sdk/domains/files/services/directory_service.py

@@ -265,8 +265,11 @@ class DirectoryService(DatabaseService[Directory]):
             # Update timestamp
             directory.updated_utc_ts = dt.datetime.now(dt.UTC).timestamp()
             
-            # Save to DynamoDB
+            # Call prep_for_save() AFTER all properties are set
+            # This ensures GSI lambdas evaluate with the updated values
             directory.prep_for_save()
+            
+            # Save to DynamoDB
             return self._save_model(directory)
             
         except (ValidationError, AccessDeniedError) as e:
@@ -514,8 +517,11 @@ class DirectoryService(DatabaseService[Directory]):
             directory.parent_id = new_parent_id
             directory.updated_utc_ts = dt.datetime.now(dt.UTC).timestamp()
             
-            # Save to DynamoDB
+            # Call prep_for_save() AFTER all properties (parent_id, full_path) are set
+            # This ensures GSI lambdas evaluate with the updated values
             directory.prep_for_save()
+            
+            # Save to DynamoDB
             save_result = self._save_model(directory)
             
             if not save_result.success:
@@ -549,22 +555,41 @@ class DirectoryService(DatabaseService[Directory]):
         directory_name: str,
         parent_id: Optional[str]
     ) -> bool:
-        """Check if directory name already exists in parent."""
+        """Check if directory with this full path already exists.
+        
+        Args:
+            tenant_id: Tenant ID
+            directory_name: Name of directory to check
+            parent_id: Parent directory ID (None for root)
+            
+        Returns:
+            True if a non-deleted directory with this path exists
+        """
         try:
-            # Use GSI2 to query subdirectories by parent
+            # Build the expected full_path for the new directory
+            if parent_id:
+                # Get parent to build full path
+                parent = self._get_model_by_id(parent_id, Directory)
+                if not parent:
+                    return False  # Parent doesn't exist, can't check
+                expected_full_path = f"{parent.full_path}/{directory_name}"
+            else:
+                # Root directory
+                expected_full_path = f"/{directory_name}"
+            
+            # Query GSI1 by full_path to check for duplicates
             temp_directory = Directory()
             temp_directory.tenant_id = tenant_id
-            temp_directory.parent_id = parent_id
-            temp_directory.directory_name = directory_name
+            temp_directory.full_path = expected_full_path
             
-            query_result = self._query_by_index(temp_directory, "gsi2", limit=1)
+            query_result = self._query_by_index(temp_directory, "gsi1", limit=1)
             
             if not query_result.success:
                 return False
             
-            # Check if any non-deleted directories with this name exist
+            # Check if any non-deleted directories with this path exist
             for directory in query_result.data:
-                if directory.directory_name == directory_name and directory.status != "deleted":
+                if directory.status != "deleted":
                     return True
             
             return False

geek_cafe_saas_sdk/domains/files/services/file_system_service.py

@@ -14,6 +14,7 @@ from geek_cafe_saas_sdk.core.service_errors import ValidationError, NotFoundErro
 from geek_cafe_saas_sdk.core.error_codes import ErrorCode
 from geek_cafe_saas_sdk.domains.files.models.file import File
 from geek_cafe_saas_sdk.domains.files.services.s3_file_service import S3FileService
+from geek_cafe_saas_sdk.domains.files.services.directory_service import DirectoryService
 import os
 from pathlib import Path
 
@@ -36,7 +37,8 @@ class FileSystemService(DatabaseService[File]):
         dynamodb: Optional[DynamoDB] = None,
         table_name: Optional[str] = None,
         s3_service: Optional[S3FileService] = None,
-        default_bucket: Optional[str] = None
+        default_bucket: Optional[str] = None,
+        request_context: Optional[Dict[str, str]] = None
     ):
         """
         Initialize FileSystemService.
@@ -47,9 +49,10 @@ class FileSystemService(DatabaseService[File]):
             s3_service: S3FileService instance
             default_bucket: Default S3 bucket
         """
-        super().__init__(dynamodb=dynamodb, table_name=table_name)
+        super().__init__(dynamodb=dynamodb, table_name=table_name, request_context=request_context)
         self.s3_service = s3_service or S3FileService(default_bucket=default_bucket)
         self.default_bucket = default_bucket or os.getenv("S3_FILE_BUCKET")
+        self.directory_service = DirectoryService(dynamodb=dynamodb, table_name=table_name, request_context=request_context)
     
     def create(
         self,
@@ -280,6 +283,16 @@ class FileSystemService(DatabaseService[File]):
                 "status", "derived_file_count"
             ]
             
+            # Track if GSI-affecting fields changed
+            directory_changed = "directory_id" in updates
+            name_changed = "file_name" in updates
+            
+            old_directory_id = file.directory_id
+            old_file_name = file.file_name
+            old_virtual_path = file.virtual_path
+            
+            
+            # Apply updates (only allowed fields)
             for field, value in updates.items():
                 if field in allowed_fields:
                     setattr(file, field, value)
@@ -288,8 +301,30 @@ class FileSystemService(DatabaseService[File]):
             import datetime as dt
             file.updated_utc_ts = dt.datetime.now(dt.UTC).timestamp()
             
-            # Save to DynamoDB
+            # If directory or name changed, manually update the GSI1 lambda
+            # because it was set during init and needs to be recreated with new values
+            if directory_changed or name_changed:
+                # get the directory
+                directory_result = self.directory_service.get_by_id(
+                    resource_id=file.directory_id,
+                    tenant_id=tenant_id,
+                    user_id=user_id
+                )
+                if not directory_result.success:
+                    return directory_result
+                
+                directory = directory_result.data
+                
+                # update the file path
+                file.virtual_path = f"{directory.full_path}/{file.file_name}"
+
+                # update the file name
+                file.file_name = file.file_name                
+            
+            # Call prep_for_save() AFTER all properties are set
             file.prep_for_save()
+            
+            # Save to DynamoDB
             return self._save_model(file)
             
         except AccessDeniedError as e:

geek_cafe_saas_sdk/domains/files/services/file_version_service.py

@@ -8,6 +8,7 @@ MIT License. See Project Root for the license information.
 from typing import Dict, Any, Optional, List
 from boto3.dynamodb.conditions import Key
 from boto3_assist.dynamodb.dynamodb import DynamoDB
+from boto3_assist.dynamodb.dynamodb_index import DynamoDBKey
 from geek_cafe_saas_sdk.services.database_service import DatabaseService
 from geek_cafe_saas_sdk.core.service_result import ServiceResult
 from geek_cafe_saas_sdk.core.service_errors import ValidationError, NotFoundError, AccessDeniedError
@@ -38,7 +39,8 @@ class FileVersionService(DatabaseService[FileVersion]):
         table_name: Optional[str] = None,
         s3_service: Optional[S3FileService] = None,
         default_bucket: Optional[str] = None,
-        max_versions: Optional[int] = None
+        max_versions: Optional[int] = None,
+        request_context: Optional[Dict[str, str]] = None
     ):
         """
         Initialize FileVersionService.
@@ -50,7 +52,7 @@ class FileVersionService(DatabaseService[FileVersion]):
             default_bucket: Default S3 bucket
             max_versions: Maximum versions to retain (default: 25)
         """
-        super().__init__(dynamodb=dynamodb, table_name=table_name)
+        super().__init__(dynamodb=dynamodb, table_name=table_name, request_context=request_context)
         self.s3_service = s3_service or S3FileService(default_bucket=default_bucket)
         self.default_bucket = default_bucket or os.getenv("S3_FILE_BUCKET")
         self.max_versions = max_versions or int(os.getenv("FILE_MAX_VERSIONS", "25"))
@@ -92,13 +94,12 @@ class FileVersionService(DatabaseService[FileVersion]):
                     "versioning_strategy"
                 )
             
-            # Get current version number
-            current_version_num = self._get_latest_version_number(tenant_id, file_id)
+            # Get current version number from file metadata (more reliable than GSI query)
+            current_version_num = file.version_count or 0
             new_version_num = current_version_num + 1
             
             # Create FileVersion model
             version = FileVersion()
-            version.prep_for_save()
             version.tenant_id = tenant_id
             version.file_id = file_id
             version.version_number = new_version_num
@@ -110,6 +111,9 @@ class FileVersionService(DatabaseService[FileVersion]):
             version.is_current = True
             version.status = "active"
             
+            # Must call prep_for_save before accessing version_id
+            version.prep_for_save()
+            
             # Build S3 key for this version
             s3_key = f"{tenant_id}/files/{file_id}/versions/{version.version_id}/{file.file_name}"
             version.s3_bucket = self.default_bucket
@@ -132,8 +136,7 @@ class FileVersionService(DatabaseService[FileVersion]):
             if file.current_version_id:
                 self._mark_version_as_not_current(tenant_id, file_id, file.current_version_id)
             
-            # Save version metadata to DynamoDB
-            version.prep_for_save()
+            # Save version metadata to DynamoDB (already called prep_for_save above)
             save_result = self._save_model(version)
             
             if not save_result.success:
@@ -367,21 +370,26 @@ class FileVersionService(DatabaseService[FileVersion]):
                 )
             
             # Use GSI1 to query versions by file
-            temp_version = FileVersion()
-            temp_version.file_id = file_id
-            
-            # Query using helper method (descending to get newest first)
-            query_result = self._query_by_index(temp_version, "gsi1", limit=limit, ascending=False)
+            gsi1_pk = DynamoDBKey.build_key(("file", file_id))
             
-            if not query_result.success:
-                return query_result
+            # Query using boto3_assist DynamoDB query
+            results = self.dynamodb.query(
+                key=Key("gsi1_pk").eq(gsi1_pk),
+                table_name=self.table_name,
+                index_name="gsi1",
+                ascending=False,  # Descending order (newest first)
+                limit=limit
+            )
             
-            # Filter results
+            # Map results to FileVersion models
             versions = []
-            for version in query_result.data:
-                # Filter out archived versions (which includes deleted ones)
-                if version.status == "active":
-                    versions.append(version)
+            if results and 'Items' in results:
+                for item in results['Items']:
+                    version = FileVersion()
+                    version.map(item)
+                    # Filter out archived versions (which includes deleted ones)
+                    if version.status == "active":
+                        versions.append(version)
             
             return ServiceResult.success_result(versions)
             
@@ -577,21 +585,10 @@ class FileVersionService(DatabaseService[FileVersion]):
     ) -> None:
         """Update file record with current version info."""
         try:
-            file = File()
-            file.id = file_id
-            file.tenant_id = tenant_id
-            
-            key = file.get_key("gsi1")
-            
-            result = self.dynamodb.get(
-                table_name=self.table_name,
-                key=key
-            )
+            # Use DatabaseService helper to get the file (uses primary key)
+            file = self._get_model_by_id_with_tenant_check(file_id, File, tenant_id)
             
-            if result and 'Item' in result:
-                file = File()
-                file.map(result['Item'])
-                
+            if file:
                 file.current_version_id = version_id
                 file.version_count = version_number
                 file.updated_utc_ts = dt.datetime.now(dt.UTC).timestamp()
@@ -605,13 +602,13 @@ class FileVersionService(DatabaseService[FileVersion]):
         """Apply version retention policy (delete old versions beyond max_versions)."""
         try:
             # Get all versions
-            gsi1_pk = f"FILE#{tenant_id}#{file_id}"
+            gsi1_pk = DynamoDBKey.build_key(("file", file_id))
             
             results = self.dynamodb.query(
-                key=Key('gsi1_pk').eq(gsi1_pk) & Key('gsi1_sk').begins_with("VERSION#"),
+                key=Key("gsi1_pk").eq(gsi1_pk),
                 table_name=self.table_name,
                 index_name="gsi1",
-                ascending=False  # Newest first
+                ascending=False  # Descending order (newest first)
             )
             
             items = results.get('Items', [])

geek_cafe_saas_sdk/domains/messaging/handlers/chat_channels/create/app.py

@@ -16,7 +16,7 @@ handler_wrapper = create_handler(
 )
 
 
-def handler(event: Dict[str, Any], context: Any, injected_service=None) -> Dict[str, Any]:
+def lambda_handler(event: Dict[str, Any], context: Any, injected_service=None) -> Dict[str, Any]:
     """
     Create a new chat channel.
     

geek_cafe_saas_sdk/domains/messaging/handlers/chat_channels/delete/app.py

@@ -15,7 +15,7 @@ handler_wrapper = create_handler(
 )
 
 
-def handler(event: Dict[str, Any], context: Any, injected_service=None) -> Dict[str, Any]:
+def lambda_handler(event: Dict[str, Any], context: Any, injected_service=None) -> Dict[str, Any]:
     """
     Delete (soft delete) a chat channel.
     

geek_cafe_saas_sdk/domains/messaging/handlers/chat_channels/get/app.py

@@ -15,7 +15,7 @@ handler_wrapper = create_handler(
 )
 
 
-def handler(event: Dict[str, Any], context: Any, injected_service=None) -> Dict[str, Any]:
+def lambda_handler(event: Dict[str, Any], context: Any, injected_service=None) -> Dict[str, Any]:
     """
     Get a chat channel by ID.
     

geek_cafe_saas_sdk/domains/messaging/handlers/chat_channels/list/app.py

@@ -18,7 +18,7 @@ handler_wrapper = create_handler(
 )
 
 
-def handler(event: Dict[str, Any], context: Any, injected_service=None) -> Dict[str, Any]:
+def lambda_handler(event: Dict[str, Any], context: Any, injected_service=None) -> Dict[str, Any]:
     """
     List chat channels based on query parameters.
     

geek_cafe_saas_sdk/domains/messaging/handlers/chat_channels/update/app.py

@@ -19,7 +19,7 @@ handler_wrapper = create_handler(
 )
 
 
-def handler(event: Dict[str, Any], context: Any, injected_service=None) -> Dict[str, Any]:
+def lambda_handler(event: Dict[str, Any], context: Any, injected_service=None) -> Dict[str, Any]:
     """
     Update a chat channel.
     

geek_cafe_saas_sdk/domains/messaging/handlers/chat_messages/create/app.py

@@ -16,7 +16,7 @@ handler_wrapper = create_handler(
 )
 
 
-def handler(event: Dict[str, Any], context: Any, injected_service=None) -> Dict[str, Any]:
+def lambda_handler(event: Dict[str, Any], context: Any, injected_service=None) -> Dict[str, Any]:
     """
     Create a new chat message.
     

geek_cafe_saas_sdk/domains/messaging/handlers/chat_messages/delete/app.py

@@ -15,7 +15,7 @@ handler_wrapper = create_handler(
 )
 
 
-def handler(event: Dict[str, Any], context: Any, injected_service=None) -> Dict[str, Any]:
+def lambda_handler(event: Dict[str, Any], context: Any, injected_service=None) -> Dict[str, Any]:
     """
     Delete (soft delete) a chat message.
     

geek_cafe_saas_sdk/domains/messaging/handlers/chat_messages/get/app.py

@@ -15,7 +15,7 @@ handler_wrapper = create_handler(
 )
 
 
-def handler(event: Dict[str, Any], context: Any, injected_service=None) -> Dict[str, Any]:
+def lambda_handler(event: Dict[str, Any], context: Any, injected_service=None) -> Dict[str, Any]:
     """
     Get a chat message by ID.
     

geek_cafe_saas_sdk/domains/messaging/handlers/chat_messages/list/app.py

@@ -18,7 +18,7 @@ handler_wrapper = create_handler(
 )
 
 
-def handler(event: Dict[str, Any], context: Any, injected_service=None) -> Dict[str, Any]:
+def lambda_handler(event: Dict[str, Any], context: Any, injected_service=None) -> Dict[str, Any]:
     """
     List chat messages based on query parameters.
     

geek_cafe_saas_sdk/domains/messaging/handlers/chat_messages/update/app.py

@@ -18,7 +18,7 @@ handler_wrapper = create_handler(
 )
 
 
-def handler(event: Dict[str, Any], context: Any, injected_service=None) -> Dict[str, Any]:
+def lambda_handler(event: Dict[str, Any], context: Any, injected_service=None) -> Dict[str, Any]:
     """
     Update a chat message.
     

geek_cafe_saas_sdk/domains/messaging/handlers/contact_threads/create/app.py

@@ -19,7 +19,7 @@ handler_wrapper = create_handler(
 )
 
 
-def handler(event: Dict[str, Any], context: Any, injected_service=None) -> Dict[str, Any]:
+def lambda_handler(event: Dict[str, Any], context: Any, injected_service=None) -> Dict[str, Any]:
     """
     Create a new contact thread.
     

geek_cafe_saas_sdk/domains/messaging/handlers/contact_threads/delete/app.py

@@ -15,7 +15,7 @@ handler_wrapper = create_handler(
 )
 
 
-def handler(event: Dict[str, Any], context: Any, injected_service=None) -> Dict[str, Any]:
+def lambda_handler(event: Dict[str, Any], context: Any, injected_service=None) -> Dict[str, Any]:
     """
     Delete (soft delete) a contact thread.
     

geek_cafe_saas_sdk/domains/messaging/handlers/contact_threads/get/app.py

@@ -15,7 +15,7 @@ handler_wrapper = create_handler(
 )
 
 
-def handler(event: Dict[str, Any], context: Any, injected_service=None) -> Dict[str, Any]:
+def lambda_handler(event: Dict[str, Any], context: Any, injected_service=None) -> Dict[str, Any]:
     """
     Get a contact thread by ID.
     

geek_cafe_saas_sdk/domains/messaging/handlers/contact_threads/list/app.py

@@ -18,7 +18,7 @@ handler_wrapper = create_handler(
 )
 
 
-def handler(event: Dict[str, Any], context: Any, injected_service=None) -> Dict[str, Any]:
+def lambda_handler(event: Dict[str, Any], context: Any, injected_service=None) -> Dict[str, Any]:
     """
     List contact threads based on query parameters.
     

geek_cafe_saas_sdk/domains/messaging/handlers/contact_threads/update/app.py

@@ -20,7 +20,7 @@ handler_wrapper = create_handler(
 )
 
 
-def handler(event: Dict[str, Any], context: Any, injected_service=None) -> Dict[str, Any]:
+def lambda_handler(event: Dict[str, Any], context: Any, injected_service=None) -> Dict[str, Any]:
     """
     Update a contact thread.