Move implementation into src directory

Signed-off-by: Federico Busetti <[email protected]>

Author: febus982

.idea/bootstrap-fastapi-service.iml

@@ -36,7 +36,7 @@ install-dependencies:
 	poetry install --no-root --with http,grpc
 
 dev-dependencies:
-	poetry install --no-root --with http,grpc,dev
+	poetry install --with http,grpc,dev
 
 update-dependencies:
 	poetry update --with http,grpc,dev

Makefile

@@ -2,7 +2,7 @@
 
 [alembic]
 # path to migration scripts
-script_location = alembic
+script_location = src/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
@@ -12,7 +12,7 @@ file_template = %%(year)d-%%(month).2d-%%(day).2d-%%(hour).2d%%(minute).2d%%(sec
 
 # sys.path path, will be prepended to sys.path if present.
 # defaults to the current working directory.
-prepend_sys_path = .
+#prepend_sys_path = .
 
 # timezone to use when rendering the date within the migration file
 # as well as the filename.
@@ -56,13 +56,6 @@ version_path_separator = os  # Use os.pathsep. Default configuration used for ne
 # output_encoding = utf-8
 
 # We inject db names and config using env.py in alembic directory
-#databases = engine1, engine2
-
-#[engine1]
-#sqlalchemy.url = driver://user:pass@localhost/dbname
-
-#[engine2]
-#sqlalchemy.url = driver://user:pass@localhost/dbname2
 
 [post_write_hooks]
 # post_write_hooks defines scripts or Python functions that are run

alembic.ini

@@ -4,6 +4,9 @@ version = "0.1.0"
 description = ""
 authors = ["Federico Busetti <[email protected]>"]
 readme = "README.md"
+packages = [
+    { include = "**/*.py", from = "src" }
+]
 
 [build-system]
 requires = ["poetry-core"]
@@ -83,17 +86,11 @@ pymdown-extensions = "*"
 
 [tool.coverage.run]
 branch = true
-source = [
-    "http_app",
-    "grpc_app",
-    "domains",
-    "gateways",
-    "celery_worker",
-    "common",
-]
+source = ["src"]
 omit = [
-    "grpc_app/generated/*",
-    "common/config.py",
+    "src/alembic/*",
+    "src/common/config.py",
+    "src/grpc_app/generated/*",
 ]
 # It's not necessary to configure concurrency here
 # because pytest-cov takes care of that
@@ -107,14 +104,8 @@ exclude_also = [
     ]
 
 [tool.mypy]
-files = [
-    "domains",
-    "grpc_app",
-    "http_app",
-    "gateways",
-    "tests",
-    "common",
-]
+files = ["src", "tests"]
+exclude = ["alembic"]
 plugins = "pydantic.mypy,strawberry.ext.mypy_plugin"
 
 # We can remove celery by installing `celery-types` but needs
@@ -136,7 +127,7 @@ testpaths = [
 [tool.ruff]
 target-version = "py39"
 extend-exclude = [
-    "grpc_app/generated",
+    "src/grpc_app/generated",
     "docs",
 ]
 
@@ -172,4 +163,4 @@ ignore = [
 [tool.ruff.lint.per-file-ignores]
 "__init__.py" = ["F401"]  # Ignore unused imports on init files
 "tests/**/*.py" = ["S101"]  # Allow assert usage on tests
-"grpc_app/**/*.py" = ["N802"]  # Function name lowercase
+"src/grpc_app/**/*.py" = ["N802"]  # Function name lowercase

http_app/templates.py

@@ -0,0 +1,7 @@
+# Copy of alembic.ini used to run migrations inside the container
+
+[alembic]
+script_location = alembic
+prepend_sys_path = .
+file_template = %%(year)d-%%(month).2d-%%(day).2d-%%(hour).2d%%(minute).2d%%(second).2d-%%(rev)s_%%(slug)s
+version_path_separator = os  # Use os.pathsep. Default configuration used for new projects.

pyproject.toml

@@ -1,11 +1,11 @@
 import logging
 from asyncio import get_event_loop
 
+from common.bootstrap import application_init
+from common.config import AppConfig
 from sqlalchemy.ext.asyncio import AsyncEngine
 
 from alembic import context
-from common.bootstrap import application_init
-from common.config import AppConfig
 
 USE_TWOPHASE = False