channel-app 0.0.157a8__tar.gz → 0.0.157a10__tar.gz

{channel_app-0.0.157a8 → channel_app-0.0.157a10}/PKG-INFO

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

{channel_app-0.0.157a8 → channel_app-0.0.157a10}/channel_app/alembic.ini

@@ -36,10 +36,10 @@ prepend_sys_path = .
 # sourceless = false
 
 # version location specification; This defaults
-# to migrations/versions.  When using multiple version
+# to alembic/versions.  When using multiple version
 # directories, initial revisions must be specified with --version-path.
 # The path separator used here should be the separator specified by "version_path_separator" below.
-# version_locations = %(here)s/bar:%(here)s/bat:migrations/versions
+# version_locations = %(here)s/bar:%(here)s/bat:alembic/versions
 
 # version path separator; As mentioned above, this is the character used to split
 # version_locations. The default within new alembic.ini files is "os", which uses os.pathsep.
@@ -63,7 +63,7 @@ version_path_separator = os
 # are written from script.py.mako
 # output_encoding = utf-8
 
-sqlalchemy.url = postgresql+psycopg2://postgres:12345@127.0.0.1/sales_channel_logs
+sqlalchemy.url = driver://user:pass@localhost/dbname
 
 
 [post_write_hooks]

{channel_app-0.0.157a8 → channel_app-0.0.157a10}/channel_app/database/migrations/env.py

@@ -1,11 +1,9 @@
-import os
 from logging.config import fileConfig
 
 from sqlalchemy import engine_from_config
 from sqlalchemy import pool
 
 from alembic import context
-
 from channel_app.core import settings
 from channel_app.database.models import Base as BaseModel
 
@@ -30,7 +28,7 @@ target_metadata = BaseModel.metadata
 # ... etc.
 
 DATABASE_URL = f"postgresql+psycopg2://{settings.DB_USER}:{settings.DB_PASSWORD}@{settings.DB_HOST}:{settings.DB_PORT}/{settings.DB_NAME}"
-url = config.set_main_option("sqlalchemy.url", DATABASE_URL)
+config.set_main_option("sqlalchemy.url", DATABASE_URL)
 
 
 def run_migrations_offline() -> None:
@@ -45,11 +43,8 @@ def run_migrations_offline() -> None:
     script output.
 
     """
-    url = config.get_main_option("sqlalchemy.url")
-    
-    DATABASE_URL = f"postgresql+psycopg2://{settings.DB_USER}:{settings.DB_PASSWORD}@{settings.DB_HOST}:{settings.DB_PORT}/{settings.DB_NAME}"
     url = config.set_main_option("sqlalchemy.url", DATABASE_URL)
-
+    
     context.configure(
         url=url,
         target_metadata=target_metadata,

channel_app-0.0.157a8/channel_app/database/migrations/versions/881a968ee603_add_step_and_exception_logs.py → channel_app-0.0.157a10/channel_app/database/migrations/versions/6d5ae5b9c541_create_initial_tables.py

@@ -1,8 +1,8 @@
-"""add step and exception logs
+"""create initial tables
 
-Revision ID: 881a968ee603
-Revises: 6049560b1ecb
-Create Date: 2025-04-24 11:58:59.377131
+Revision ID: 6d5ae5b9c541
+Revises: 
+Create Date: 2025-05-07 19:10:39.137004
 
 """
 from typing import Sequence, Union
@@ -12,8 +12,8 @@ import sqlalchemy as sa
 
 
 # revision identifiers, used by Alembic.
-revision: str = '881a968ee603'
-down_revision: Union[str, None] = '6049560b1ecb'
+revision: str = '6d5ae5b9c541'
+down_revision: Union[str, None] = None
 branch_labels: Union[str, Sequence[str], None] = None
 depends_on: Union[str, Sequence[str], None] = None
 
@@ -21,6 +21,18 @@ depends_on: Union[str, Sequence[str], None] = None
 def upgrade() -> None:
     """Upgrade schema."""
     # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table('log_flows',
+    sa.Column('id', sa.UUID(), nullable=False),
+    sa.Column('transaction_id', sa.UUID(), nullable=False),
+    sa.Column('flow_name', sa.String(length=255), nullable=False),
+    sa.Column('flow_author', sa.Enum('user', 'system', name='logflowauthor'), nullable=False),
+    sa.Column('started_at', sa.DateTime(timezone=True), nullable=False),
+    sa.Column('ended_at', sa.DateTime(timezone=True), nullable=True),
+    sa.Column('status', sa.Enum('in_progress', 'success', 'failure', name='logstepstatus'), nullable=True),
+    sa.Column('s3_key', sa.Text(), nullable=True),
+    sa.PrimaryKeyConstraint('id'),
+    sa.UniqueConstraint('transaction_id')
+    )
     op.create_table('log_steps',
     sa.Column('id', sa.UUID(), nullable=False),
     sa.Column('flow_id', sa.UUID(), nullable=False),
@@ -52,4 +64,5 @@ def downgrade() -> None:
     # ### commands auto generated by Alembic - please adjust! ###
     op.drop_table('log_step_exceptions')
     op.drop_table('log_steps')
+    op.drop_table('log_flows')
     # ### end Alembic commands ###

{channel_app-0.0.157a8 → channel_app-0.0.157a10}/channel_app/logs/services.py

@@ -182,7 +182,7 @@ class S3Client:
             "AWS_ACCESS_KEY_ID": os.getenv("AWS_ACCESS_KEY_ID"),
             "AWS_SECRET_ACCESS_KEY": os.getenv("AWS_SECRET_ACCESS_KEY"),
             "AWS_REGION": os.getenv("S3_REGION_NAME"),
-            "LOGGING_S3_BUCKET": os.getenv("S3_BUCKET_NAME"),
+            "S3_BUCKET_NAME": os.getenv("S3_BUCKET_NAME"),
         }
 
         missing_vars = [

channel_app-0.0.157a10/channel_app/migrate.py

@@ -0,0 +1,22 @@
+import os
+import sys
+from alembic.config import Config
+from alembic import command
+
+def migrate():
+    base_dir = os.path.dirname(os.path.abspath(__file__))
+    ini_path = os.path.join(base_dir, 'alembic.ini')
+
+    alembic_cfg = Config(ini_path)
+    alembic_cfg.set_main_option("script_location", os.path.join(base_dir, "database", "migrations"))
+
+    command.upgrade(alembic_cfg, "head")
+
+
+if __name__ == "__main__":
+    try:
+        migrate()
+    except Exception as e:
+        print(f"Migration failed: {e}")
+
+        sys.exit(1)

{channel_app-0.0.157a8 → channel_app-0.0.157a10}/channel_app.egg-info/PKG-INFO

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

{channel_app-0.0.157a8 → channel_app-0.0.157a10}/channel_app.egg-info/SOURCES.txt

@@ -12,6 +12,7 @@ tox.ini
 .vscode/settings.json
 channel_app/__init__.py
 channel_app/alembic.ini
+channel_app/migrate.py
 channel_app.egg-info/PKG-INFO
 channel_app.egg-info/SOURCES.txt
 channel_app.egg-info/dependency_links.txt
@@ -54,12 +55,9 @@ channel_app/database/__init__.py
 channel_app/database/models.py
 channel_app/database/services.py
 channel_app/database/migrations/README
-channel_app/database/migrations/__init__.py
 channel_app/database/migrations/env.py
 channel_app/database/migrations/script.py.mako
-channel_app/database/migrations/versions/6049560b1ecb_create_flow_logs.py
-channel_app/database/migrations/versions/881a968ee603_add_step_and_exception_logs.py
-channel_app/database/migrations/versions/__init__.py
+channel_app/database/migrations/versions/6d5ae5b9c541_create_initial_tables.py
 channel_app/logs/__init__.py
 channel_app/logs/encoders.py
 channel_app/logs/enums.py

{channel_app-0.0.157a8 → channel_app-0.0.157a10}/setup.py

@@ -5,7 +5,7 @@ with open("README.md") as f:
 
 setup(
     name="channel_app",
-    version="0.0.157a8", # alpha prerelease
+    version="0.0.157a10", # alpha prerelease
     packages=find_packages(),
     url="https://github.com/akinon/channel_app",
     description="Channel app for Sales Channels",

channel_app-0.0.157a8/channel_app/database/migrations/versions/6049560b1ecb_create_flow_logs.py

@@ -1,43 +0,0 @@
-"""create flow_logs
-
-Revision ID: 6049560b1ecb
-Revises: 
-Create Date: 2025-04-22 15:53:37.986109
-
-"""
-from typing import Sequence, Union
-
-from alembic import op
-import sqlalchemy as sa
-
-
-# revision identifiers, used by Alembic.
-revision: str = '6049560b1ecb'
-down_revision: Union[str, None] = None
-branch_labels: Union[str, Sequence[str], None] = None
-depends_on: Union[str, Sequence[str], None] = None
-
-
-def upgrade() -> None:
-    """Upgrade schema."""
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.create_table('log_flows',
-    sa.Column('id', sa.UUID(), nullable=False),
-    sa.Column('transaction_id', sa.UUID(), nullable=False),
-    sa.Column('flow_name', sa.String(length=255), nullable=False),
-    sa.Column('flow_author', sa.Enum('user', 'system', name='logflowauthor'), nullable=False),
-    sa.Column('started_at', sa.DateTime(timezone=True), nullable=False),
-    sa.Column('ended_at', sa.DateTime(timezone=True), nullable=True),
-    sa.Column('status', sa.Enum('in_progress', 'success', 'failure', name='logstepstatus'), nullable=True),
-    sa.Column('s3_key', sa.Text(), nullable=True),
-    sa.PrimaryKeyConstraint('id'),
-    sa.UniqueConstraint('transaction_id')
-    )
-    # ### end Alembic commands ###
-
-
-def downgrade() -> None:
-    """Downgrade schema."""
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.drop_table('log_flows')
-    # ### end Alembic commands ###