Skip to content

Commit dc20b94

Browse files
DinisCruzDinisCruz
committed
updated to latest version of OSBot_Utils
1 parent 6250b67 commit dc20b94

15 files changed

+44
-49
lines changed

‎osbot_aws/aws/cloud_front/Cloud_Front.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import time
22
from typing import List
33
from osbot_utils.type_safe.Type_Safe import Type_Safe
4-
from osbot_utils.type_safe.decorators.type_safe import type_safe
4+
from osbot_utils.type_safe.type_safe_core.decorators.type_safe import type_safe
55
from osbot_aws.apis.Session import Session
66

77

‎osbot_aws/aws/lambda_/dependencies/Lambda__Dependency__Base.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from osbot_utils.utils.Files import current_temp_folder
2-
from osbot_utils.helpers.safe_str.Safe_Str__File__Path import Safe_Str__File__Path
2+
from osbot_utils.type_safe.primitives.safe_str.filesystem.Safe_Str__File__Path import Safe_Str__File__Path
33
from osbot_aws.AWS_Config import AWS_Config
44
from osbot_aws.aws.lambda_.schemas.Safe_Str__File__Name__Python_Package import Safe_Str__File__Name__Python_Package
55
from osbot_utils.type_safe.Type_Safe import Type_Safe

‎osbot_aws/aws/lambda_/dependencies/Lambda__Dependency__Inside_Lambda.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import sys
22
from osbot_utils.utils.Zip import zip_bytes__extract_to_folder
3-
from osbot_utils.helpers.Safe_Id import Safe_Id
3+
from osbot_utils.type_safe.primitives.safe_str.identifiers.Safe_Id import Safe_Id
44
from osbot_utils.utils.Files import path_combine, folder_exists, files_list__virtual_paths
55
from osbot_aws.aws.lambda_.dependencies.Lambda__Dependency__Base import Lambda__Dependency__Base
66
from osbot_aws.aws.lambda_.dependencies.Lambda__Dependency__S3 import Lambda__Dependency__S3

‎osbot_aws/aws/lambda_/dependencies/Lambda__Dependency__Local.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
from osbot_aws.aws.lambda_.dependencies.Lambda__Dependency__Base import Lambda__Dependency__Base
2+
from osbot_utils.type_safe.primitives.safe_str.identifiers.Safe_Id import Safe_Id
23
from osbot_utils.utils.Zip import zip_folder_to_bytes
3-
from osbot_utils.helpers.Safe_Id import Safe_Id
44
from osbot_aws.aws.lambda_.schemas.Safe_Str__File__Path__Python_Package import Safe_Str__File__Path__Python_Package
55
from osbot_aws.aws.lambda_.schemas.Schema__Lambda__Dependency__Local_Install__Data import Schema__Lambda__Dependency__Local_Install__Data
66
from osbot_utils.utils.Json import json_file_load, json_file_save
7-
from osbot_utils.helpers.safe_str.Safe_Str__File__Path import Safe_Str__File__Path
7+
from osbot_utils.type_safe.primitives.safe_str.filesystem.Safe_Str__File__Path import Safe_Str__File__Path
88
from osbot_utils.helpers.duration.decorators.capture_duration import capture_duration
99
from osbot_utils.utils.Files import path_combine, files_list__virtual_paths, file_exists, file_delete, folder_delete_recursively, current_temp_folder, create_folder
1010
from osbot_utils.utils.Process import Process

‎osbot_aws/aws/lambda_/schemas/Safe_Str__File__Name__Python_Package.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import re
2-
from osbot_utils.helpers.safe_str.Safe_Str__File__Name import Safe_Str__File__Name
2+
from osbot_utils.type_safe.primitives.safe_str.filesystem.Safe_Str__File__Name import Safe_Str__File__Name
33

44
TYPE_SAFE_STR__FILE__PATH__PYTHON_PACKAGE__REGEX = re.compile(r'[^a-zA-Z0-9_\-. =]') # Allow alphanumerics, underscores, hyphens, dots, slashes, spaces and equal
55

‎osbot_aws/aws/lambda_/schemas/Safe_Str__File__Path__Python_Package.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import re
2-
3-
from osbot_utils.helpers.safe_str.Safe_Str__File__Path import Safe_Str__File__Path
2+
from osbot_utils.type_safe.primitives.safe_str.filesystem.Safe_Str__File__Path import Safe_Str__File__Path
43

54
TYPE_SAFE_STR__FILE_PATH__PYTHON_PACKAGE__REGEX = re.compile(r'[^a-zA-Z0-9_\-./\\ =]') # Allow alphanumerics, underscores, hyphens, dots, slashes, spaces and equal
65

‎osbot_aws/aws/lambda_/schemas/Schema__Lambda__Dependency__Local_Install__Data.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
from typing import List
2-
from osbot_utils.helpers.safe_str.Safe_Str__File__Path import Safe_Str__File__Path
3-
from osbot_utils.type_safe.Type_Safe import Type_Safe
4-
from osbot_utils.helpers.Timestamp_Now import Timestamp_Now
5-
from osbot_aws.aws.lambda_.schemas.Safe_Str__File__Path__Python_Package import Safe_Str__File__Path__Python_Package
6-
from osbot_aws.aws.lambda_.schemas.Safe_Str__File__Name__Python_Package import Safe_Str__File__Name__Python_Package
1+
from typing import List
2+
from osbot_utils.type_safe.primitives.safe_int.Timestamp_Now import Timestamp_Now
3+
from osbot_utils.type_safe.primitives.safe_str.filesystem.Safe_Str__File__Path import Safe_Str__File__Path
4+
from osbot_utils.type_safe.Type_Safe import Type_Safe
5+
from osbot_aws.aws.lambda_.schemas.Safe_Str__File__Path__Python_Package import Safe_Str__File__Path__Python_Package
6+
from osbot_aws.aws.lambda_.schemas.Safe_Str__File__Name__Python_Package import Safe_Str__File__Name__Python_Package
77

88
class Schema__Lambda__Dependency__Local_Install__Data(Type_Safe):
99
package_name : Safe_Str__File__Name__Python_Package = None

‎osbot_aws/aws/s3/S3__Key_Generator.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
from datetime import datetime
2-
from osbot_utils.type_safe.decorators.type_safe import type_safe
3-
from osbot_utils.type_safe.Type_Safe import Type_Safe
4-
from osbot_utils.helpers.Safe_Id import Safe_Id
5-
from osbot_utils.utils.Misc import utc_now, date_today
1+
from datetime import datetime
2+
from osbot_utils.type_safe.type_safe_core.decorators.type_safe import type_safe
3+
from osbot_utils.type_safe.Type_Safe import Type_Safe
4+
from osbot_utils.type_safe.primitives.safe_str.identifiers.Safe_Id import Safe_Id
5+
from osbot_utils.utils.Misc import utc_now, date_today
66

77
S3_PATH__WHEN_BLOCK_SIZE = 5
88

‎osbot_aws/aws/s3/S3__Virtual_Storage.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
from osbot_aws.aws.s3.S3__DB_Base import S3__DB_Base
33
from osbot_utils.decorators.methods.cache_on_self import cache_on_self
44
from osbot_utils.helpers.llms.cache.Virtual_Storage__Local__Folder import Virtual_Storage__Local__Folder
5-
from osbot_utils.helpers.safe_str.Safe_Str__File__Path import Safe_Str__File__Path
5+
from osbot_utils.type_safe.primitives.safe_str.filesystem.Safe_Str__File__Path import Safe_Str__File__Path
66
from osbot_utils.utils.Files import path_combine_safe
77

88
VIRTUAL_STORAGE__DEFAULT__ROOT_FOLDER = Safe_Str__File__Path("s3-virtual-storage/")

‎osbot_aws/deploy/Deploy_Lambda.py‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
from osbot_aws.aws.lambda_.Lambda import DEFAULT__LAMBDA__EPHEMERAL_STORAGE, DEFAULT__LAMBDA__MEMORY_SIZE
2-
from osbot_utils.type_safe.Type_Safe import Type_Safe
3-
from osbot_aws.aws.lambda_ import boto3__lambda
4-
from osbot_utils.type_safe.decorators.type_safe import type_safe
5-
from osbot_utils.utils.Env import load_dotenv
6-
from osbot_aws.apis.shell.Shell_Client import Shell_Client
7-
from osbot_aws.helpers.Lambda_Layer_Create import Lambda_Layer_Create
8-
from osbot_aws.OSBot_Setup import OSBot_Setup
9-
from osbot_aws.apis.test_helpers.Temp_Aws_Roles import Temp_Aws_Roles
10-
from osbot_aws.helpers.Lambda_Package import Lambda_Package
1+
from osbot_aws.aws.lambda_.Lambda import DEFAULT__LAMBDA__EPHEMERAL_STORAGE, DEFAULT__LAMBDA__MEMORY_SIZE
2+
from osbot_utils.type_safe.Type_Safe import Type_Safe
3+
from osbot_aws.aws.lambda_ import boto3__lambda
4+
from osbot_utils.type_safe.type_safe_core.decorators.type_safe import type_safe
5+
from osbot_utils.utils.Env import load_dotenv
6+
from osbot_aws.apis.shell.Shell_Client import Shell_Client
7+
from osbot_aws.helpers.Lambda_Layer_Create import Lambda_Layer_Create
8+
from osbot_aws.OSBot_Setup import OSBot_Setup
9+
from osbot_aws.apis.test_helpers.Temp_Aws_Roles import Temp_Aws_Roles
10+
from osbot_aws.helpers.Lambda_Package import Lambda_Package
1111

1212
# todo: refactor lambda_name to be a Type_Safe variable, but that will clash with the current lambda_name() function (which is used in other projects)
1313
# stage and the other self.* vars set in the __init__ should also be Type_Safe variables

0 commit comments

Comments
 (0)