channel-app 0.0.157a1__py3-none-any.whl → 0.0.157a2__py3-none-any.whl

channel_app/logs/encoders.py

@@ -0,0 +1,22 @@
+from datetime import datetime
+import json
+import uuid
+
+
+class UUIDEncoder(json.JSONEncoder):
+    """
+    Custom JSON encoder that handles UUID and datetime objects.
+    
+    This encoder extends the standard JSONEncoder to properly serialize:
+    - UUID objects (converted to strings)
+    - datetime objects (converted to ISO format)
+    """
+    def default(self, obj):
+        if isinstance(obj, uuid.UUID):
+            # Convert UUID to string
+            return str(obj)
+        elif isinstance(obj, datetime):
+            # Convert datetime to ISO format string
+            return obj.isoformat()
+        # Let the base class handle other types or raise TypeError
+        return super().default(obj)

channel_app/logs/services.py

@@ -1,12 +1,20 @@
 from contextlib import contextmanager
+import json
+import os
 import traceback
 from typing import Optional
 import uuid
 from datetime import datetime, timezone
+import boto3
 from sqlalchemy.orm import scoped_session, sessionmaker
 
-from channel_app.database.models import LogFlowModel, LogStepExceptionModel, LogStepModel
+from channel_app.database.models import (
+    LogFlowModel,
+    LogStepExceptionModel,
+    LogStepModel,
+)
 from channel_app.database.services import DatabaseService
+from channel_app.logs.encoders import UUIDEncoder
 from channel_app.logs.enums import LogFlowAuthor, LogStepStatus
 
 
@@ -17,23 +25,22 @@ class LogService:
         self.flow = {}
         self.steps = []
         self.exceptions = []
-        
+
         self.db_engine = self.database_service.create_engine()
-        self.s3_client = None # TODO: Declare the boto3 client
-        self.s3_bucket = None # TODO: Get s3 bucket from exported environment variables
+        self.s3_client = S3Client()
 
     def create_flow(
-        self, 
-        name: str, 
-        transaction_id: str, 
-        flow_author: LogFlowAuthor = LogFlowAuthor.system
+        self,
+        name: str,
+        transaction_id: str,
+        flow_author: LogFlowAuthor = LogFlowAuthor.system,
     ):
         self.flow = {
             "id": uuid.uuid4(),
             "transaction_id": transaction_id or str(uuid.uuid4()),
             "flow_name": name,
             "flow_author": flow_author.value,
-            "started_at": datetime.now(timezone.utc)
+            "started_at": datetime.now(timezone.utc),
         }
 
     @contextmanager
@@ -46,14 +53,16 @@ class LogService:
         except Exception as exc:
             self.add_exception(exc)
             for step in reversed(self.steps):
-                if step["step_name"] == name and step.get("status") == LogStepStatus.in_progress.value:
+                if (
+                    step["step_name"] == name
+                    and step.get("status") == LogStepStatus.in_progress.value
+                ):
                     step["end_time"] = now
                     step["status"] = LogStepStatus.failure.value
                     step["error"] = str(exc)
                     break
             raise
 
-
     def _add_step(self, name, start=False, end=False, metadata=None):
         now = datetime.now(timezone.utc)
         if start:
@@ -68,10 +77,15 @@ class LogService:
             )
         elif end:
             for step in reversed(self.steps):
-                if step["step_name"] == name and step["status"] == LogStepStatus.in_progress.value:
+                if (
+                    step["step_name"] == name
+                    and step["status"] == LogStepStatus.in_progress.value
+                ):
                     step["end_time"] = now
                     step["status"] = LogStepStatus.success.value
-                    step["duration_ms"] = int((now - step["start_time"]).total_seconds() * 1000)
+                    step["duration_ms"] = int(
+                        (now - step["start_time"]).total_seconds() * 1000
+                    )
 
     def add_exception(self, exc: Exception):
         tb = traceback.format_exc()
@@ -79,7 +93,7 @@ class LogService:
             "id": uuid.uuid4(),
             "type": type(exc).__name__,
             "message": str(exc),
-            "traceback": tb
+            "traceback": tb,
         }
         self.exceptions.append(exc_obj)
         # If this flow has related step, update the step to FAILURE
@@ -97,8 +111,7 @@ class LogService:
         }
         s3_key = f"logs/{self.flow['flow_name']}/{self.flow['transaction_id']}.json"
 
-        self._upload_to_s3(s3_key, full_log_content)
-        
+        self.s3_client.upload_object(s3_key, full_log_content)
 
         log_flow_object = LogFlowModel(
             id=self.flow["id"],
@@ -107,7 +120,9 @@ class LogService:
             flow_author=self.flow["flow_author"],
             started_at=self.flow["started_at"],
             ended_at=self.flow["ended_at"],
-            status=self.steps[-1]["status"] if self.steps else LogStepStatus.failure.value,
+            status=(
+                self.steps[-1]["status"] if self.steps else LogStepStatus.failure.value
+            ),
             s3_key=s3_key,
         )
         
@@ -141,10 +156,6 @@ class LogService:
         
         self._save_to_db(log_flow_object, step_models, exception_models)
 
-    def _upload_to_s3(self, key: str, content: dict):
-        # TODO: Implement this.
-        pass
-
     def _save_to_db(self, flow_obj, step_objs, exception_objs):
         session = scoped_session(sessionmaker(bind=self.db_engine))
         try:
@@ -157,4 +168,45 @@ class LogService:
             session.rollback()
             raise
         finally:
-            session.close()
+            session.close()
+
+
+class S3Client:
+    def __init__(self):
+        self._validate_credentials()
+        self.client = boto3.client("s3")
+        self.bucket = os.getenv("LOGGING_S3_BUCKET", "default-bucket-name")
+
+    def _validate_credentials(self):
+        required_env_vars = {
+            "AWS_ACCESS_KEY_ID": os.getenv("AWS_ACCESS_KEY_ID"),
+            "AWS_SECRET_ACCESS_KEY": os.getenv("AWS_SECRET_ACCESS_KEY"),
+            "AWS_REGION": os.getenv("AWS_REGION"),
+            "LOGGING_S3_BUCKET": os.getenv("LOGGING_S3_BUCKET"),
+        }
+
+        missing_vars = [
+            name for name, value in required_env_vars.items() if value is None
+        ]
+
+        if missing_vars:
+            raise ValueError(
+                f"S3 Client initialization failed: missing AWS credentials: {', '.join(missing_vars)}"
+            )
+
+    def set_bucket(self, bucket_name: str):
+        self.bucket = bucket_name
+        return self
+
+    def upload_object(self, key: str, content: dict):
+        try:
+            body = json.dumps(content, indent=2, cls=UUIDEncoder).encode("utf-8")
+            self.client.put_object(
+                Bucket=self.bucket,
+                Key=key,
+                Body=body,
+                ContentType="application/json",
+            )
+        except Exception as e:
+            print(f"[S3 Upload Error] {e}")
+            raise

{channel_app-0.0.157a1.dist-info → channel_app-0.0.157a2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: channel-app
-Version: 0.0.157a1
+Version: 0.0.157a2
 Summary: Channel app for Sales Channels
 Home-page: https://github.com/akinon/channel_app
 Author: akinonteam

{channel_app-0.0.157a1.dist-info → channel_app-0.0.157a2.dist-info}/RECORD

@@ -36,8 +36,9 @@ channel_app/database/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hS
 channel_app/database/models.py,sha256=cdjLcfJe-OYZzk1fl3JL6ght8jryRYLwMF2uV3srM-o,2314
 channel_app/database/services.py,sha256=0zHLAcJAKRU6hKEaS9DmsX_2gIE29hh__DfHHx3JuSE,216
 channel_app/logs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+channel_app/logs/encoders.py,sha256=6CVgtkV7DrjxGpNXCJgT9bn9B2Ep0lHgtm-0ES7A57I,703
 channel_app/logs/enums.py,sha256=If6ZjwRTerbJypYI8WjdsleHR7FjlV-TP2nBppFVEc4,214
-channel_app/logs/services.py,sha256=HmFiQNt5VZQErUqjy-uDJHD9ruQw-GtCoWY5UfCpROY,5751
+channel_app/logs/services.py,sha256=O488OStOe9C-2AIU34bjHEBB3_XywgGlLEn77JJHUu4,7173
 channel_app/omnitron/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 channel_app/omnitron/batch_request.py,sha256=S8IHtbI1RtVLbnOwtfXSmkrREGp8wUYW2E-eu5omwyY,3550
 channel_app/omnitron/constants.py,sha256=WZR6k_k2zZfN7lfi1ZLv1PphsHIq_LiZgw6Nd6LduvE,2793
@@ -64,7 +65,7 @@ channel_app/omnitron/commands/tests/test_product_images.py,sha256=y6tmiJ00kd2GTq
 channel_app/omnitron/commands/tests/test_product_prices.py,sha256=5HPX9PmjGw6gk3oNrwtWLqdrOkfeNx1mYP-pYwOesZU,3496
 channel_app/omnitron/commands/tests/test_product_stocks.py,sha256=q4RGlrCNUUJyN5CBL1fzrvdd4Q3xt816mbMRQT0XEd0,3496
 channel_app/omnitron/commands/tests/test_products.py,sha256=uj5KLaubY3XNu0hidOH-u-Djfboe81Hj7-lP--01Le0,103494
-channel_app-0.0.157a1.dist-info/METADATA,sha256=LEmj3OpOthxDuz4h1mK8_8ZbHIvRsY-KOIbW5FzTI0o,311
-channel_app-0.0.157a1.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-channel_app-0.0.157a1.dist-info/top_level.txt,sha256=JT-gM6L5Cwxr1xEoN7NHrREDs-d6iGFGfRnK-NrJ3tU,12
-channel_app-0.0.157a1.dist-info/RECORD,,
+channel_app-0.0.157a2.dist-info/METADATA,sha256=qyT2b6_Y3MwOreXTMrwfW3D113VS133PS5sAKy711OI,311
+channel_app-0.0.157a2.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+channel_app-0.0.157a2.dist-info/top_level.txt,sha256=JT-gM6L5Cwxr1xEoN7NHrREDs-d6iGFGfRnK-NrJ3tU,12
+channel_app-0.0.157a2.dist-info/RECORD,,