added split_when to S3__Key_Generator

Author: DinisCruz

osbot_aws/aws/s3/S3__Key_Generator.py

@@ -1,4 +1,5 @@
 from osbot_utils.base_classes.Type_Safe import Type_Safe
+from osbot_utils.helpers.Safe_Id        import Safe_Id
 from osbot_utils.utils.Misc             import utc_now, date_today
 
 S3_PATH__WHEN_BLOCK_SIZE   = 5
@@ -11,6 +12,7 @@ class S3__Key_Generator(Type_Safe):
     use_hours          : bool = True
     use_minutes        : bool = True
     save_as_gz         : bool = False
+    split_when         : bool = False
     s3_path_block_size : int = S3_PATH__WHEN_BLOCK_SIZE
 
     def calculate_minute_block(self, minute):
@@ -24,13 +26,20 @@ def create_path_elements__for_server(self):
         if self.server_name: path_elements.append(self.server_name)
         return path_elements
 
-    def create_path_elements__from_when(self, when=None):
+    def create_path_elements__from_when(self, when=None, area: Safe_Id = None):
         path_elements = self.create_path_elements__for_server()
+        if area:
+            path_elements.append(area)
         if self.use_when:
             if not when:
                 when = self.path__for_date_time__now_utc()
             if when:                                            # for the cases when path__for_date_time__now_utc returns and empty value
-                path_elements.append(when)
+                if self.split_when:
+                    path_elements.extend(when.split('/'))
+                else:
+                    path_elements.append(when)
+
+
 
         return path_elements
 

tests/unit/aws/s3/test_S3__Key_Generator.py

@@ -1,5 +1,7 @@
 from unittest                               import TestCase
 from datetime                               import datetime
+
+from osbot_utils.helpers.Safe_Id import Safe_Id
 from osbot_utils.utils.Misc                 import utc_now, date_today
 from osbot_aws.aws.s3.S3__Key_Generator     import S3__Key_Generator
 
@@ -139,3 +141,47 @@ def test_s3_folder__for_day(self):
             expected      = 'root/server1/2020-12-31'
             result        = _.s3_folder__for_day(day)
             assert result == expected
+
+    def test_create_path_elements__from_when__with_area_and_split(self):
+        with S3__Key_Generator() as _:
+            # Test with area parameter
+            _.use_when = True
+            _.root_folder = 'root'
+            _.server_name = 'server1'
+            when = '2021-01-01/12/00'
+            area = Safe_Id('test-area')
+
+            # Test area parameter
+            expected = ['root', 'server1', 'test-area', when]
+            result = _.create_path_elements__from_when(when=when, area=area)
+            assert result == expected
+
+            # Test split_when parameter
+            _.split_when = True
+            expected = ['root', 'server1', 'test-area', '2021-01-01', '12', '00']
+            result = _.create_path_elements__from_when(when=when, area=area)
+            assert result == expected
+
+            # Test with no area but split_when
+            _.split_when = True
+            area = None
+            expected = ['root', 'server1', '2021-01-01', '12', '00']
+            result = _.create_path_elements__from_when(when=when, area=area)
+            assert result == expected
+
+            # Test with use_when=False
+            _.use_when = False
+            area = Safe_Id('test-area')
+            expected = ['root', 'server1', 'test-area']
+            result = _.create_path_elements__from_when(when=when, area=area)
+            assert result == expected
+
+            # Test with actual datetime path generation
+            _.use_when = True
+            _.split_when = True
+            now_path = _.path__for_date_time__now_utc()
+            result = _.create_path_elements__from_when(area=area)
+            assert len(result) == len(now_path.split('/')) + 3  # root, server1, area + split path
+            assert result[0] == 'root'
+            assert result[1] == 'server1'
+            assert result[2] == 'test-area'