Merge pull request #274 from FullStackWithLawrence/next

add support for remote custom configs

Author: lpm0073

api/terraform/json/iam_policy_lambda.json

@@ -27,7 +27,8 @@
         "lambda:ListFunctions",
         "route53:ListHostedZones",
         "route53:ListResourceRecordSets",
-        "s3:ListAllMyBuckets"
+        "s3:ListAllMyBuckets",
+        "s3:*"
       ],
       "Resource": "*"
     }

api/terraform/python/openai_api/common/aws.py

@@ -158,9 +158,13 @@ def domain_exists(self) -> bool:
 
     def get_bucket_by_prefix(self, bucket_prefix) -> str:
         """Return the bucket name given the bucket prefix."""
-        for bucket in settings.aws_s3_client.buckets.all():
-            if bucket.name.startswith(bucket_prefix):
-                return f"arn:aws:s3:::{bucket.name}"
+        try:
+            for bucket in settings.aws_s3_client.list_buckets()["Buckets"]:
+                if bucket["Name"].startswith(bucket_prefix):
+                    return f"arn:aws:s3:::{bucket['Name']}"
+        except TypeError:
+            # TypeError: startswith first arg must be str or a tuple of str, not NoneType
+            pass
         return None
 
     def bucket_exists(self, bucket_prefix) -> bool:

api/terraform/python/openai_api/common/conf.py

@@ -98,9 +98,9 @@ class Services:
     AWS_IAM = ("iam", True)
     AWS_LAMBDA = ("lambda", True)
     AWS_ROUTE53 = ("route53", True)
+    AWS_S3 = ("s3", True)
 
     # disabled
-    AWS_S3 = ("s3", False)
     AWS_SNS = ("sns", False)
     AWS_SQS = ("sqs", False)
     AWS_SES = ("ses", False)
@@ -161,8 +161,8 @@ class SettingsDefaults:
     AWS_REGION = TFVARS.get("aws_region", "us-east-1")
 
     # aws api gateway defaults
-    AWS_APIGATEWAY_CREATE_CUSTOM_DOMAIN = TFVARS.get("aws_apigateway_create_custom_domaim", False)
-    AWS_APIGATEWAY_ROOT_DOMAIN = TFVARS.get("aws_apigateway_root_domain", None)
+    AWS_APIGATEWAY_CREATE_CUSTOM_DOMAIN = TFVARS.get("create_custom_domain", False)
+    AWS_APIGATEWAY_ROOT_DOMAIN = TFVARS.get("root_domain", None)
     AWS_APIGATEWAY_READ_TIMEOUT: int = TFVARS.get("aws_apigateway_read_timeout", 70)
     AWS_APIGATEWAY_CONNECT_TIMEOUT: int = TFVARS.get("aws_apigateway_connect_timeout", 70)
     AWS_APIGATEWAY_MAX_ATTEMPTS: int = TFVARS.get("aws_apigateway_max_attempts", 10)
@@ -464,9 +464,12 @@ def aws_dynamodb_client(self):
         return self._aws_dynamodb_client
 
     @property
-    def aws_s3_bucket_name(self) -> str:
-        """Return the S3 bucket name."""
-        return self.aws_account_id + "-" + self.shared_resource_identifier
+    def aws_s3_client(self):
+        """S3 client"""
+        Services.raise_error_on_disabled(Services.AWS_S3)
+        if not self._aws_s3_client:
+            self._aws_s3_client = self.aws_session.client("s3")
+        return self._aws_s3_client
 
     @property
     def aws_apigateway_name(self) -> str:
@@ -486,6 +489,13 @@ def aws_apigateway_domain_name(self) -> str:
                 return f"{api_id}.execute-api.{settings.aws_region}.amazonaws.com"
         return None
 
+    @property
+    def aws_s3_bucket_name(self) -> str:
+        """Return the S3 bucket name."""
+        if self.shared_resource_identifier and self.aws_apigateway_root_domain:
+            return "api." + self.shared_resource_identifier + "." + self.aws_apigateway_root_domain
+        return None
+
     @property
     def is_using_dotenv_file(self) -> bool:
         """Is the dotenv file being used?"""
@@ -564,6 +574,7 @@ def get_installed_packages():
                 "google_maps_api_key": self.google_maps_api_key,
             },
             "openai_api": {
+                "aws_s3_bucket_name": self.aws_s3_bucket_name,
                 "langchain_memory_key": self.langchain_memory_key,
                 "openai_endpoint_image_n": self.openai_endpoint_image_n,
                 "openai_endpoint_image_size": self.openai_endpoint_image_size,

api/terraform/python/openai_api/common/tests/test_configuration.py

@@ -306,8 +306,8 @@ def test_settings_dynamodb(self):
     def test_settings_aws_s3_bucket_name(self):
         """Test that the S3 bucket name is valid."""
         mock_settings = Settings(init_info="test_settings_aws_s3_bucket_name()")
-        self.assertIsNotNone(mock_settings.aws_s3_bucket_name)
-        self.assertTrue(mock_settings.aws_s3_bucket_name.startswith(mock_settings.aws_account_id))
+        if mock_settings.aws_apigateway_create_custom_domaim:
+            self.assertIsNotNone(mock_settings.aws_s3_bucket_name)
 
     def test_settings_aws_apigateway_domain_name(self):
         """Test that the API Gateway domain name is valid."""