Skip to content

Commit

Permalink
Created initial structure. Added linters, dockerfile, actions
Browse files Browse the repository at this point in the history
  • Loading branch information
Fan4ik20 committed Sep 7, 2023
1 parent 226e27b commit 451bc7a
Show file tree
Hide file tree
Showing 25 changed files with 484 additions and 0 deletions.
28 changes: 28 additions & 0 deletions .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: Lint
on:
pull_request:
push: { branches: master }

jobs:
test:
defaults:
run:
working-directory: ./app

name: Run lint suite
runs-on: ubuntu-latest

steps:
- name: Checkout code
uses: actions/checkout@v3

- name: Grant privileges
run: chmod +x ./lint.sh

- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install -r requirements_dev.txt
- name: Run testing phase
run: ./lint.sh
11 changes: 11 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# JetBrains
.idea

# Python
venv
__pycache__
*.sql

# Secrets
.env
.env.local
27 changes: 27 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
repos:
- repo: https://github.com/psf/black
rev: 22.12.0
hooks:
- id: black
args: ["--config=app/pyproject.toml"]

- repo: https://github.com/pycqa/isort
rev: 5.12.0
hooks:
- id: isort
args: ["--settings-path=app/pyproject.toml"]

- repo: https://github.com/pycqa/flake8
rev: 6.0.0
hooks:
- id: flake8
entry: pflake8
additional_dependencies: [pyproject-flake8]
args: ["--config=app/pyproject.toml"]

- repo: https://github.com/pre-commit/mirrors-mypy
rev: v1.5.0
hooks:
- id: mypy
args: ['--config-file', 'app/pyproject.toml', '--show-traceback']
name: mypy
17 changes: 17 additions & 0 deletions app/.dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Ignore everything
*

# Allow files and directories

#Global
!/app
!/alembic.ini
!/requirements.txt
!/start.sh

#Lint
!/.git
!/.pre-commit-config.yaml
!/pyproject.toml
!/requirements_dev.txt
!/lint.sh
4 changes: 4 additions & 0 deletions app/.env.sample
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
DB_USER=
DB_PASSWORD=
DB_ENDPOINT=
DB_NAME=
21 changes: 21 additions & 0 deletions app/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Pull base image
FROM python:3.10

# Set environment varibles
ENV PYTHONDONTWRITEBYTECODE 1
ENV PYTHONUNBUFFERED 1

WORKDIR /code/

# Install dependencies
RUN pip install --upgrade pip
COPY ./requirements.txt .
RUN pip install -r requirements.txt

# Copy app
COPY . .

EXPOSE 7777

RUN chmod +x ./start.sh
CMD ["./start.sh"]
116 changes: 116 additions & 0 deletions app/alembic.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
# A generic, single database configuration.

[alembic]
# path to migration scripts
script_location = infrastructure/database/alembic

# template used to generate migration file names; The default value is %%(rev)s_%%(slug)s
# Uncomment the line below if you want the files to be prepended with date and time
# see https://alembic.sqlalchemy.org/en/latest/tutorial.html#editing-the-ini-file
# for all available tokens
# file_template = %%(year)d_%%(month).2d_%%(day).2d_%%(hour).2d%%(minute).2d-%%(rev)s_%%(slug)s

# sys.path path, will be prepended to sys.path if present.
# defaults to the current working directory.
prepend_sys_path = .

# timezone to use when rendering the date within the migration file
# as well as the filename.
# If specified, requires the python-dateutil library that can be
# installed by adding `alembic[tz]` to the pip requirements
# string value is passed to dateutil.tz.gettz()
# leave blank for localtime
# timezone =

# max length of characters to apply to the
# "slug" field
# truncate_slug_length = 40

# set to 'true' to run the environment during
# the 'revision' command, regardless of autogenerate
# revision_environment = false

# set to 'true' to allow .pyc and .pyo files without
# a source .py file to be detected as revisions in the
# versions/ directory
# sourceless = false

# version location specification; This defaults
# to infrastructure/database/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:infrastructure/database/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.
# If this key is omitted entirely, it falls back to the legacy behavior of splitting on spaces and/or commas.
# Valid values for version_path_separator are:
#
# version_path_separator = :
# version_path_separator = ;
# version_path_separator = space
version_path_separator = os # Use os.pathsep. Default configuration used for new projects.

# set to 'true' to search source files recursively
# in each "version_locations" directory
# new in Alembic version 1.10
# recursive_version_locations = false

# the output encoding used when revision files
# are written from script.py.mako
# output_encoding = utf-8

sqlalchemy.url =


[post_write_hooks]
# post_write_hooks defines scripts or Python functions that are run
# on newly generated revision scripts. See the documentation for further
# detail and examples

# format using "black" - use the console_scripts runner, against the "black" entrypoint
# hooks = black
# black.type = console_scripts
# black.entrypoint = black
# black.options = -l 79 REVISION_SCRIPT_FILENAME

# lint with attempts to fix using "ruff" - use the exec runner, execute a binary
# hooks = ruff
# ruff.type = exec
# ruff.executable = %(here)s/.venv/bin/ruff
# ruff.options = --fix REVISION_SCRIPT_FILENAME

# Logging configuration
[loggers]
keys = root,sqlalchemy,alembic

[handlers]
keys = console

[formatters]
keys = generic

[logger_root]
level = WARN
handlers = console
qualname =

[logger_sqlalchemy]
level = WARN
handlers =
qualname = sqlalchemy.engine

[logger_alembic]
level = INFO
handlers =
qualname = alembic

[handler_console]
class = StreamHandler
args = (sys.stderr,)
level = NOTSET
formatter = generic

[formatter_generic]
format = %(levelname)-5.5s [%(name)s] %(message)s
datefmt = %H:%M:%S
Empty file added app/core/__init__.py
Empty file.
Empty file added app/core/domain/__init__.py
Empty file.
Empty file added app/core/services/__init__.py
Empty file.
Empty file added app/infrastructure/__init__.py
Empty file.
13 changes: 13 additions & 0 deletions app/infrastructure/database/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
from .db_utils import (
DBConfig,
build_async_db_url,
create_engine,
create_sessionmaker,
)

__all__ = (
"DBConfig",
"create_engine",
"create_sessionmaker",
"build_async_db_url",
)
1 change: 1 addition & 0 deletions app/infrastructure/database/alembic/README
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Generic single-database configuration.
106 changes: 106 additions & 0 deletions app/infrastructure/database/alembic/env.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
# type: ignore

from logging.config import fileConfig

from alembic import context
from alembic.script import ScriptDirectory
from sqlalchemy.ext.asyncio import create_async_engine

from infrastructure.database import DBConfig, build_async_db_url, models

# this is the Alembic Config object, which provides
# access to the values within the .ini file in use.
config = context.config

# this will overwrite the ini-file sqlalchemy.url path
# with the path given in the config of the main code

# TODO. NOT WORKING
config.set_main_option("sqlalchemy.url", build_async_db_url(DBConfig()))

# Interpret the config file for Python logging.
# This line sets up loggers basically.
if config.config_file_name is not None:
fileConfig(config.config_file_name)

# here target_metadata was equal to None
target_metadata = models.Base.metadata

# other values from the config, defined by the needs of env.py,
# can be acquired:
# my_important_option = config.get_main_option("my_important_option")
# ... etc.


def process_revision_directives(context, revision, directives):
# extract Migration
migration_script = directives[0]
# extract current head revision
head_revision = ScriptDirectory.from_config(
context.config
).get_current_head()

if head_revision is None:
# edge case with first migration
new_rev_id = 1
else:
# default branch with incrementation
last_rev_id = int(head_revision.lstrip("0"))
new_rev_id = last_rev_id + 1
# fill zeros up to 5 digits: 1 -> 00001
migration_script.rev_id = "{0:05}".format(new_rev_id)


def run_migrations_offline():
"""Run migrations in 'offline' mode.
This configures the context with just a URL
and not an Engine, though an Engine is acceptable
here as well. By skipping the Engine creation
we don't even need a DBAPI to be available.
Calls to context.execute() here emit the given string to the
script output.
"""
url = config.get_main_option("sqlalchemy.url")
context.configure(
url=url,
target_metadata=target_metadata,
literal_binds=True,
dialect_opts={"paramstyle": "named"},
)

with context.begin_transaction():
context.run_migrations()


async def run_migrations_online():
"""Run migrations in 'online' mode.
In this scenario we need to create an Engine
and associate a connection with the context.
"""
engine = create_async_engine(config.get_main_option("sqlalchemy.url"))

def do_migrations(connection_):
context.configure(
connection=connection_,
target_metadata=target_metadata,
process_revision_directives=process_revision_directives,
)

with context.begin_transaction():
context.run_migrations()

async with engine.connect() as connection:
await connection.run_sync(do_migrations)


if context.is_offline_mode():
run_migrations_offline()
else:
import asyncio

asyncio.run(run_migrations_online())
26 changes: 26 additions & 0 deletions app/infrastructure/database/alembic/script.py.mako
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
"""${message}

Revision ID: ${up_revision}
Revises: ${down_revision | comma,n}
Create Date: ${create_date}

"""
from typing import Sequence, Union

from alembic import op
import sqlalchemy as sa
${imports if imports else ""}

# revision identifiers, used by Alembic.
revision: str = ${repr(up_revision)}
down_revision: Union[str, None] = ${repr(down_revision)}
branch_labels: Union[str, Sequence[str], None] = ${repr(branch_labels)}
depends_on: Union[str, Sequence[str], None] = ${repr(depends_on)}


def upgrade() -> None:
${upgrades if upgrades else "pass"}


def downgrade() -> None:
${downgrades if downgrades else "pass"}
Loading

0 comments on commit 451bc7a

Please sign in to comment.