reach_commons 0.17.1__tar.gz → 0.17.3__tar.gz

{reach_commons-0.17.1 → reach_commons-0.17.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: reach_commons
-Version: 0.17.1
+Version: 0.17.3
 Summary: Reach Commons is a versatile utility library designed to streamline and enhance development workflows within the Reach ecosystem.
 License: MIT
 Author: Wilson Moraes

{reach_commons-0.17.1 → reach_commons-0.17.3}/pyproject.toml

@@ -1,7 +1,7 @@
 # isort .; black .; poetry build; poetry publish
 [tool.poetry]
 name = "reach_commons"
-version = "0.17.1"
+version = "0.17.3"
 description = "Reach Commons is a versatile utility library designed to streamline and enhance development workflows within the Reach ecosystem."
 authors = ["Wilson Moraes <wmoraes@getreach.ai>"]
 license = "MIT"

{reach_commons-0.17.1 → reach_commons-0.17.3}/reach_commons/app_logging/log_deprecated_endpoints.py

@@ -46,7 +46,7 @@ def add_deprecation_headers(
         )
 
     elif current_date >= removal_date:
-        logger.error(
+        logger.warning(
             f"Access to removed endpoint: {method} {path}. "
             f"Removal date was {removal_date_str}."
             + (f" Replacement endpoint: {replacement_url}" if replacement_url else "")

reach_commons-0.17.3/reach_commons/reach_aws/s3.py

@@ -0,0 +1,113 @@
+from functools import cached_property
+from io import BytesIO
+from urllib.parse import unquote, urlparse
+
+import boto3
+
+from reach_commons.app_logging.logger import get_reach_logger
+
+
+class S3Client:
+    def __init__(
+        self,
+        logger=get_reach_logger(),
+        region_name="us-east-1",
+        profile_name=None,
+    ):
+        self.logger = logger
+        self.region_name = region_name
+        self.profile_name = profile_name
+
+    @cached_property
+    def client(self):
+        session = boto3.Session(
+            region_name=self.region_name, profile_name=self.profile_name
+        )
+
+        return session.client("s3")
+
+    def _parse_s3_url(self, url: str) -> tuple[str, str]:
+        """
+        Support various S3 URL formats:
+        - s3://bucket/key
+        - https://bucket.s3.amazonaws.com/key
+        - https://bucket.s3.<region>.amazonaws.com/key
+        - https://s3.<region>.amazonaws.com/bucket/key (path-style)
+        - https://s3.amazonaws.com/bucket/key (path-style)
+        """
+        p = urlparse(url)
+
+        if p.scheme == "s3":
+            bucket = p.netloc
+            key = p.path.lstrip("/")
+            return bucket, unquote(key)
+
+        host = p.netloc
+        path = p.path.lstrip("/")
+
+        # Path-style: s3.<region>.amazonaws.com/bucket/key  ou s3.amazonaws.com/bucket/key
+        if host.startswith("s3.") or host == "s3.amazonaws.com":
+            parts = path.split("/", 1)
+            if not parts or not parts[0]:
+                raise ValueError(f"Invalid S3 URL (missing bucket in path): {url}")
+            bucket = parts[0]
+            key = parts[1] if len(parts) > 1 else ""
+            return bucket, unquote(key)
+
+        # Virtual-hosted: bucket.s3[.<region>].amazonaws.com/key
+        bucket = host.split(".")[0]
+        key = path
+        if not bucket:
+            raise ValueError(f"Invalid S3 URL (missing bucket in host): {url}")
+        return bucket, unquote(key)
+
+    def get_object(self, s3_bucket_name, s3_key):
+        try:
+            s3_object = self.client.get_object(Bucket=s3_bucket_name, Key=s3_key)
+            actual_message_body = s3_object["Body"].read().decode("utf-8")
+
+            self.logger.info(
+                f"Retrieved object from S3: {s3_key} in bucket: {s3_bucket_name}"
+            )
+            return actual_message_body
+        except Exception as e:
+            self.logger.error(
+                f"Error retrieving object {s3_key} from bucket: {s3_bucket_name}: {str(e)}"
+            )
+
+        return None
+
+    def add_object(self, s3_bucket_name, s3_key, str_content):
+        try:
+            file_object = BytesIO(str_content.encode("utf-8"))
+
+            self.client.upload_fileobj(
+                Fileobj=file_object, Bucket=s3_bucket_name, Key=s3_key
+            )
+            url = (
+                f"https://{s3_bucket_name}.s3.{self.region_name}.amazonaws.com/{s3_key}"
+            )
+
+            self.logger.info(
+                f"Uploaded object to S3: {s3_key} in bucket: {s3_bucket_name}"
+            )
+            return url
+        except Exception as e:
+            self.logger.error(
+                f"Error uploading object {s3_key} to bucket: {s3_bucket_name}: {str(e)}"
+            )
+            return None
+
+    def delete_object_by_url(self, url: str) -> bool:
+        """
+        Deleta um objeto no S3 recebendo apenas a URL direta.
+        Retorna True se deletou (ou o objeto não existia) e False se falhou.
+        """
+        try:
+            bucket, key = self._parse_s3_url(url)
+            self.client.delete_object(Bucket=bucket, Key=key)
+            self.logger.info(f"Deleted object from S3: {key} in bucket: {bucket}")
+            return True
+        except Exception as e:
+            self.logger.error(f"Error deleting S3 object from url '{url}': {e}")
+            return False

reach_commons-0.17.1/reach_commons/reach_aws/s3.py

@@ -1,63 +0,0 @@
-from functools import cached_property
-from io import BytesIO
-
-import boto3
-
-from reach_commons.app_logging.logger import get_reach_logger
-
-
-class S3Client:
-    def __init__(
-        self,
-        logger=get_reach_logger(),
-        region_name="us-east-1",
-        profile_name=None,
-    ):
-        self.logger = logger
-        self.region_name = region_name
-        self.profile_name = profile_name
-
-    @cached_property
-    def client(self):
-        session = boto3.Session(
-            region_name=self.region_name, profile_name=self.profile_name
-        )
-
-        return session.client("s3")
-
-    def get_object(self, s3_bucket_name, s3_key):
-        try:
-            s3_object = self.client.get_object(Bucket=s3_bucket_name, Key=s3_key)
-            actual_message_body = s3_object["Body"].read().decode("utf-8")
-
-            self.logger.info(
-                f"Retrieved object from S3: {s3_key} from bucket: {s3_bucket_name}"
-            )
-            return actual_message_body
-        except Exception as e:
-            self.logger.error(
-                f"Error retrieving object {s3_key} from bucket: {s3_bucket_name}: {str(e)}"
-            )
-
-        return None
-
-    def add_object(self, s3_bucket_name, s3_key, str_content):
-        try:
-            file_object = BytesIO(str_content.encode("utf-8"))
-
-            self.client.upload_fileobj(
-                Fileobj=file_object, Bucket=s3_bucket_name, Key=s3_key
-            )
-            url = (
-                f"https://{s3_bucket_name}.s3.{self.region_name}.amazonaws.com/{s3_key}"
-            )
-
-            self.logger.info(
-                f"Uploaded object to S3: {s3_key} in bucket: {s3_bucket_name}"
-            )
-            return url
-        except Exception as e:
-            self.logger.error(
-                f"Error uploading object {s3_key} to bucket: {s3_bucket_name}: {str(e)}"
-            )
-            return None