instant-python 0.9.2__tar.gz → 0.11.0__tar.gz

{instant_python-0.9.2 → instant_python-0.11.0}/CHANGELOG.md

@@ -1,5 +1,56 @@
 # CHANGELOG
 
+<!-- version list -->
+
+## v0.11.0 (2025-09-30)
+
+### ✨ Features
+
+- **templates**: Add ruff linter and formatter rules in pyproject.toml template file
+  ([`b600f62`](https://github.com/dimanu-py/instant-python/commit/b600f62ab807d0ed5309ee199fd6b772dad55317))
+
+### 🪲 Bug Fixes
+
+- **templates**: Correct imports when selected template was standard project
+  ([`4d8bda4`](https://github.com/dimanu-py/instant-python/commit/4d8bda4fb246a59e5556c78b5317845614e3f8b5))
+
+### ♻️ Refactoring
+
+- **templates**: Modify makefile template file simplifying add-dep and remove-dep commands
+  ([`eb883f3`](https://github.com/dimanu-py/instant-python/commit/eb883f31aba41faf8b38908317ea02b53e700874))
+
+- **templates**: Rename template file for base error
+  ([`3a30d3d`](https://github.com/dimanu-py/instant-python/commit/3a30d3d3533bc88fe70f0822f204d34e3ad4280a))
+
+- **commands**: Move ipy configuration file to project folder before creating first commit
+  ([`8997e98`](https://github.com/dimanu-py/instant-python/commit/8997e984b2384e70ca2418e4cf7eb21aa3d7bdad))
+
+
+## v0.10.0 (2025-09-30)
+
+### ✨ Features
+
+- **templates**: Add 'changelog_file' entry to semantic release section in pyproject template to
+  avoid warning
+  ([`0a80d5a`](https://github.com/dimanu-py/instant-python/commit/0a80d5a4dc1cec80259d4d6e9ba0ac0a9581fc6a))
+
+### 🪲 Bug Fixes
+
+- **templates**: Correct errors import in fastapi application template
+  ([`e42cfbb`](https://github.com/dimanu-py/instant-python/commit/e42cfbb0116fa52596be60121a27bb6ee39e10cf))
+
+- **templates**: Correct errors in release.yml template
+  ([`65b96f0`](https://github.com/dimanu-py/instant-python/commit/65b96f0a0c890e18e597fb4edc4c8402b733d84d))
+
+### ⚙️ Build System
+
+- Add 'dev' dependency group for improved development workflow
+  ([`37d4c25`](https://github.com/dimanu-py/instant-python/commit/37d4c250696c07cb22b8a594b5d68309a1659c83))
+
+- Update dependencies
+  ([`31572ab`](https://github.com/dimanu-py/instant-python/commit/31572ab38b253abfee97f3e8926499e0a8f57a00))
+
+
 ## v0.9.1 (2025-07-18)
 
 ### 🪲 Bug Fixes

{instant_python-0.9.2 → instant_python-0.11.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: instant-python
-Version: 0.9.2
+Version: 0.11.0
 Summary: Instant boilerplate generation for Python projects
 Project-URL: documentation, https://dimanu-py.github.io/instant-python/
 Project-URL: repository, https://github.com/dimanu-py/instant-python/

{instant_python-0.9.2 → instant_python-0.11.0}/instant_python/templates/boilerplate/event_bus/domain_event_json_deserializer.py

@@ -1,13 +1,23 @@
 {% set template_domain_import = "shared.domain"|compute_base_path(template.name) %}
 import json
 
+{% if template_domain_import %}
 from {{ general.source_name }}.{{ template_domain_import }}.event.domain_event import DomainEvent
 from {{ general.source_name }}.{{ template_domain_import }}.event.domain_event_subscriber import (
     DomainEventSubscriber,
 )
-from {{ general.source_name }}.{{ template_domain_import }}.exceptions.domain_event_type_not_found_error import (
+from {{ general.source_name }}.{{ template_domain_import }}.errors.domain_event_type_not_found_error import (
     DomainEventTypeNotFoundError,
 )
+{% else %}
+from {{ general.source_name }}.event.domain_event import DomainEvent
+from {{ general.source_name }}.event.domain_event_subscriber import (
+    DomainEventSubscriber,
+)
+from {{ general.source_name }}.errors.domain_event_type_not_found_error import (
+    DomainEventTypeNotFoundError,
+)
+{% endif %}
 
 
 class DomainEventJsonDeserializer:

{instant_python-0.9.2 → instant_python-0.11.0}/instant_python/templates/boilerplate/event_bus/domain_event_json_serializer.py

@@ -1,7 +1,11 @@
 {% set template_domain_import = "shared.domain"|compute_base_path(template.name) %}
 import json
 
+{% if template_domain_import %}
 from {{ general.source_name }}.{{ template_domain_import }}.event.domain_event import DomainEvent
+{% else %}
+from {{ general.source_name }}.event.domain_event import DomainEvent
+{% endif %}
 
 
 class DomainEventJsonSerializer:

{instant_python-0.9.2 → instant_python-0.11.0}/instant_python/templates/boilerplate/event_bus/domain_event_subscriber.py

@@ -2,7 +2,11 @@
 {% if pythono_version in ["3.12", "3.13"] %}
 from abc import ABC, abstractmethod
 
+{% if template_domain_import %}
 from {{ general.source_name }}.{{ template_domain_import }}.event.domain_event import DomainEvent
+{% else %}
+from {{ general.source_name }}.event.domain_event import DomainEvent
+{% endif %}
 
 
 class DomainEventSubscriber[EventType: DomainEvent](ABC):
@@ -18,7 +22,11 @@ class DomainEventSubscriber[EventType: DomainEvent](ABC):
 from abc import ABC, abstractmethod
 from typing import Generic, TypeVar
 
-from {{ source_name }}.{{ template_domain_import }}.event.domain_event import DomainEvent
+{% if template_domain_import %}
+from {{ general.source_name }}.{{ template_domain_import }}.event.domain_event import DomainEvent
+{% else %}
+from {{ general.source_name }}.event.domain_event import DomainEvent
+{% endif %}
 
 EventType = TypeVar("EventType", bound=DomainEvent)
 

{instant_python-0.9.2 → instant_python-0.11.0}/instant_python/templates/boilerplate/event_bus/event_bus.py

@@ -1,7 +1,11 @@
 {% set template_domain_import = "shared.domain"|compute_base_path(template.name) %}
 from abc import ABC, abstractmethod
 
+{% if template_domain_import %}
 from {{ general.source_name }}.{{ template_domain_import }}.event.domain_event import DomainEvent
+{% else %}
+from {{ general.source_name }}.event.domain_event import DomainEvent
+{% endif %}
 
 
 class EventBus(ABC):

{instant_python-0.9.2 → instant_python-0.11.0}/instant_python/templates/boilerplate/event_bus/mock_event_bus.py

@@ -1,8 +1,13 @@
 {% set template_domain_import = "shared.domain"|compute_base_path(template.name) %}
 from unittest.mock import AsyncMock
 
+{% if template_domain_import %}
 from {{ general.source_name }}.{{ template_domain_import }}.event.domain_event import DomainEvent
 from {{ general.source_name }}.{{ template_domain_import }}.event.event_bus import EventBus
+{% else %}
+from {{ general.source_name }}.event.domain_event import DomainEvent
+from {{ general.source_name }}.event.event_bus import EventBus
+{% endif %}
 
 
 class MockEventBus(EventBus):

{instant_python-0.9.2 → instant_python-0.11.0}/instant_python/templates/boilerplate/event_bus/rabbit_mq_configurer.py

@@ -1,16 +1,32 @@
 {% set template_domain_import = "shared.domain"|compute_base_path(template.name) %}
 {% set template_infra_import = "shared.infra"|compute_base_path(template.name) %}
 
+{% if template_domain_import %}
 from {{ general.source_name }}.{{ template_domain_import }}.event.domain_event import DomainEvent
 from {{ general.source_name }}.{{ template_domain_import }}.event.domain_event_subscriber import (
     DomainEventSubscriber,
 )
+{% else %}
+from {{ general.source_name }}.event.domain_event import DomainEvent
+from {{ general.source_name }}.event.domain_event_subscriber import (
+    DomainEventSubscriber,
+)
+{% endif %}
+{% if template_infra_import %}
 from {{ general.source_name }}.{{ template_infra_import }}.event.rabbit_mq.rabbit_mq_connection import (
     RabbitMqConnection,
 )
 from {{ general.source_name }}.{{ template_infra_import }}.event.rabbit_mq.rabbit_mq_queue_formatter import (
     RabbitMqQueueFormatter,
 )
+{% else %}
+from {{ general.source_name }}.event.rabbit_mq.rabbit_mq_connection import (
+    RabbitMqConnection,
+)
+from {{ general.source_name }}.event.rabbit_mq.rabbit_mq_queue_formatter import (
+    RabbitMqQueueFormatter,
+)
+{% endif %}
 
 
 class RabbitMqConfigurer:

{instant_python-0.9.2 → instant_python-0.11.0}/instant_python/templates/boilerplate/event_bus/rabbit_mq_connection.py

@@ -5,13 +5,26 @@ from typing import Callable
 import pika
 from pika.adapters.blocking_connection import BlockingChannel
 
+{% if template_domain_import %}
 from {{ general.source_name }}.{{ template_domain_import }}.event.exchange_type import ExchangeType
-from {{ general.source_name }}.{{ template_domain_import }}.exceptions.rabbit_mq_connection_not_established_error import (
+from {{ general.source_name }}.{{ template_domain_import }}.errors.rabbit_mq_connection_not_established_error import (
     RabbitMqConnectionNotEstablishedError,
 )
+{% else %}
+from {{ general.source_name }}.event.exchange_type import ExchangeType
+from {{ general.source_name }}.errors.rabbit_mq_connection_not_established_error import (
+    RabbitMqConnectionNotEstablishedError,
+)
+{% endif %}
+{% if template_infra_import %}
 from {{ general.source_name }}.{{ template_infra_import }}.event.rabbit_mq.rabbit_mq_settings import (
     RabbitMqSettings,
 )
+{% else %}
+from {{ general.source_name }}.event.rabbit_mq.rabbit_mq_settings import (
+    RabbitMqSettings,
+)
+{% endif %}
 
 
 class RabbitMqConnection:

{instant_python-0.9.2 → instant_python-0.11.0}/instant_python/templates/boilerplate/event_bus/rabbit_mq_consumer.py

@@ -3,10 +3,18 @@
 from pika.adapters.blocking_connection import BlockingChannel
 from pika.spec import Basic, BasicProperties
 
+{% if template_domain_import %}
 from {{ general.source_name }}.{{ template_domain_import }}.event.domain_event import DomainEvent
 from {{ general.source_name }}.{{ template_domain_import }}.event.domain_event_subscriber import (
     DomainEventSubscriber,
 )
+{% else %}
+from {{ general.source_name }}.event.domain_event import DomainEvent
+from {{ general.source_name }}.event.domain_event_subscriber import (
+    DomainEventSubscriber,
+)
+{% endif %}
+{% if template_infra_import %}
 from {{ general.source_name }}.{{ template_infra_import }}.event.domain_event_json_deserializer import (
     DomainEventJsonDeserializer,
 )
@@ -16,6 +24,17 @@ from {{ general.source_name }}.{{ template_infra_import }}.event.rabbit_mq.rabbi
 from {{ general.source_name }}.{{ template_infra_import }}.event.rabbit_mq.rabbit_mq_queue_formatter import (
     RabbitMqQueueFormatter,
 )
+{% else %}
+from {{ general.source_name }}.event.domain_event_json_deserializer import (
+    DomainEventJsonDeserializer,
+)
+from {{ general.source_name }}.event.rabbit_mq.rabbit_mq_connection import (
+    RabbitMqConnection,
+)
+from {{ general.source_name }}.event.rabbit_mq.rabbit_mq_queue_formatter import (
+    RabbitMqQueueFormatter,
+)
+{% endif %}
 
 
 class RabbitMqConsumer:

{instant_python-0.9.2 → instant_python-0.11.0}/instant_python/templates/boilerplate/event_bus/rabbit_mq_event_bus.py

@@ -1,13 +1,27 @@
 {% set template_domain_import = "shared.domain"|compute_base_path(template.name) %}
 {% set template_infra_import = "shared.infra"|compute_base_path(template.name) %}
+{% if template_domain_import %}
 from {{ general.source_name }}.{{ template_domain_import }}.event.domain_event import DomainEvent
 from {{ general.source_name }}.{{ template_domain_import }}.event.event_bus import EventBus
+{% else %}
+from {{ general.source_name }}.event.domain_event import DomainEvent
+from {{ general.source_name }}.event.event_bus import EventBus
+{% endif %}
+{% if template_infra_import %}
 from {{ general.source_name }}.{{ template_infra_import }}.event.domain_event_json_serializer import (
     DomainEventJsonSerializer,
 )
 from {{ general.source_name }}.{{ template_infra_import }}.event.rabbit_mq.rabbit_mq_connection import (
     RabbitMqConnection,
 )
+{% else %}
+from {{ general.source_name }}.event.domain_event_json_serializer import (
+    DomainEventJsonSerializer,
+)
+from {{ general.source_name }}.event.rabbit_mq.rabbit_mq_connection import (
+    RabbitMqConnection,
+)
+{% endif %}
 
 
 class RabbitMqEventBus(EventBus):

instant_python-0.11.0/instant_python/templates/boilerplate/exceptions/domain_error.py

@@ -0,0 +1,11 @@
+{% set template_domain_import = "shared.domain"|compute_base_path(template.name) %}
+{% if template_infra_import %}
+from {{ general.source_name }}.{{ template_domain_import }}.errors.base_error import BaseError
+{% else %}
+from {{ general.source_name }}.errors.base_error import BaseError
+{% endif %}
+
+
+class DomainError(Error):
+    ...
+

instant_python-0.11.0/instant_python/templates/boilerplate/exceptions/domain_event_type_not_found_error.py

@@ -0,0 +1,10 @@
+{% set template_domain_import = "shared.domain"|compute_base_path(template.name) %}
+{% if template_domain_import %}
+from {{ general.source_name }}.{{ template_domain_import }}.errors.domain_error import DomainError
+{% else %}
+from {{ general.source_name }}.errors.domain_error import DomainError
+{% endif %}
+
+class DomainEventTypeNotFoundError(DomainError):
+	def __init__(self, name: str) -> None:
+		super().__init__(message=f"Event type {name} not found among subscriber.", error_type="domain_event_type_not_found",)

instant_python-0.11.0/instant_python/templates/boilerplate/exceptions/incorrect_value_type_error.py

@@ -0,0 +1,15 @@
+{% set template_domain_import = "shared.domain"|compute_base_path(template.name) %}
+from typing import TypeVar
+
+{% if template_domain_import %}
+from {{ general.source_name }}.{{ template_domain_import }}.errors.domain_error import DomainError
+{% else %}
+from {{ general.source_name }}.errors.domain_error import DomainError
+{% endif %}
+
+T = TypeVar("T")
+
+
+class IncorrectValueTypeError(DomainError):
+    def __init__(self, value: T) -> None:
+        super().__init__(message=f"Value '{value}' is not of type {type(value).__name__}", error_type="incorrect_value_type", )

instant_python-0.11.0/instant_python/templates/boilerplate/exceptions/invalid_id_format_error.py

@@ -0,0 +1,11 @@
+{% set template_domain_import = "shared.domain"|compute_base_path(template.name) %}
+{% if template_domain_import %}
+from {{ general.source_name }}.{{ template_domain_import }}.errors.domain_error import DomainError
+{% else %}
+from {{ general.source_name }}.errors.domain_error import DomainError
+{% endif %}
+
+
+class InvalidIdFormatError(DomainError):
+    def __init__(self) -> None:
+        super().__init__(message="User id must be a valid UUID", error_type="invalid_id_format",)

instant_python-0.11.0/instant_python/templates/boilerplate/exceptions/invalid_negative_value_error.py

@@ -0,0 +1,11 @@
+{% set template_domain_import = "shared.domain"|compute_base_path(template.name) %}
+{% if template_domain_import %}
+from {{ general.source_name }}.{{ template_domain_import }}.errors.domain_error import DomainError
+{% else %}
+from {{ general.source_name }}.errors.domain_error import DomainError
+{% endif %}
+
+
+class InvalidNegativeValueError(DomainError):
+    def __init__(self, value: int) -> None:
+        super().__init__(message=f"Invalid negative value: {value}", error_type="invalid_negative_value",)

instant_python-0.11.0/instant_python/templates/boilerplate/exceptions/rabbit_mq_connection_not_established_error.py

@@ -0,0 +1,12 @@
+{% set template_domain_import = "shared.domain"|compute_base_path(template.name) %}
+{% if template_domain_import %}
+from {{ general.source_name }}.{{ template_domain_import }}.errors.domain_error import DomainError
+{% else %}
+from {{ general.source_name }}.errors.domain_error import DomainError
+{% endif %}
+
+
+
+class RabbitMqConnectionNotEstablishedError(DomainError):
+    def __init__(self) -> None:
+        super().__init__(message="RabbitMQ connection not established.", error_type="rabbit_mq_connection",)

instant_python-0.11.0/instant_python/templates/boilerplate/exceptions/required_value_error.py

@@ -0,0 +1,11 @@
+{% set template_domain_import = "shared.domain"|compute_base_path(template.name) %}
+{% if template_domain_import %}
+from {{ general.source_name }}.{{ template_domain_import }}.errors.domain_error import DomainError
+{% else %}
+from {{ general.source_name }}.errors.domain_error import DomainError
+{% endif %}
+
+
+class RequiredValueError(DomainError):
+    def __init__(self) -> None:
+        super().__init__(message="Value is required, can't be None", error_type="required_value",)

{instant_python-0.9.2 → instant_python-0.11.0}/instant_python/templates/boilerplate/fastapi/application.py

@@ -2,7 +2,7 @@
 {% set template_infra_import = "shared.infra"|compute_base_path(template.name) %}
 from fastapi import FastAPI
 {% if "logger" in template.built_in_features %}
-from fastapi.exceptions import RequestValidationError
+from fastapi.errors import RequestValidationError
 {% endif %}
 
 {% if template.name == template_types.STANDARD %}
@@ -40,9 +40,17 @@ from {{ general.source_name }}.api.lifespan import lifespan
 from {{ general.source_name }}.delivery.api.lifespan import lifespan
 {% endif %}
 {% endif %}
-from {{ general.source_name }}.{{ template_domain_import }}.exceptions.domain_error import DomainError
+{% if template_domain_import %}
+from {{ general.source_name }}.{{ template_domain_import }}.errors.domain_error import DomainError
+{% else %}
+from {{ general.source_name }}.errors.domain_error import DomainError
+{% endif %}
 {% if "logger" in template.built_in_features %}
+{% if template_infra_import %}
 from {{ general.source_name }}.{{ template_infra_import }}.logger.file_logger import create_file_logger
+{% else %}
+from {{ general.source_name }}.logger.file_logger import create_file_logger
+{% endif %}
 {% if template.name == template_types.STANDARD %}
 from {{ general.source_name }}.api.middleare.fast_api_log_middleware import FastapiLogMiddleware
 {% else %}
@@ -65,4 +73,3 @@ app.add_exception_handler(RequestValidationError, validation_error_handler)
 {% endif %}
 app.add_exception_handler(Exception, unexpected_exception_handler)
 app.add_exception_handler(DomainError, domain_error_handler)
-

{instant_python-0.9.2 → instant_python-0.11.0}/instant_python/templates/boilerplate/fastapi/error_handlers.py

@@ -3,12 +3,24 @@
 from fastapi import Request
 from fastapi.responses import JSONResponse
 {% if "logger" in template.built_in_features %}
-from fastapi.exceptions import RequestValidationError
+from fastapi.errors import RequestValidationError
 from fastapi.exception_handlers import request_validation_exception_handler
+{% if template_infra_import %}
 from {{ general.source_name }}.{{ template_infra_import }}.logger.file_logger import create_file_logger
+{% else %}
+from {{ general.source_name }}.logger.file_logger import create_file_logger
+{% endif %}
 {% endif %}
+{% if template_infra_import %}
 from {{ general.source_name }}.{{ template_infra_import }}.http.error_response import InternalServerError, UnprocessableEntityError
-from {{ general.source_name }}.{{ template_domain_import }}.exceptions.domain_error import DomainError
+{% else %}
+from {{ general.source_name }}.http.error_response import InternalServerError, UnprocessableEntityError
+{% endif %}
+{% if template_domain_import %}
+from {{ general.source_name }}.{{ template_domain_import }}.errors.domain_error import DomainError
+{% else %}
+from {{ general.source_name }}.errors.domain_error import DomainError
+{% endif %}
 
 
 {% if "logger" in template.built_in_features %}

{instant_python-0.9.2 → instant_python-0.11.0}/instant_python/templates/boilerplate/fastapi/fastapi_log_middleware.py

@@ -4,7 +4,11 @@ import time
 from fastapi import Request, Response, FastAPI
 from starlette.middleware.base import BaseHTTPMiddleware, RequestResponseEndpoint
 
+{% if template_infra_import %}
 from {{ general.source_name }}.{{ template_infra_import }}.logger.file_logger import FileLogger
+{% else %}
+from {{ general.source_name }}.logger.file_logger import FileLogger
+{% endif %}
 
 
 class FastapiLogMiddleware(BaseHTTPMiddleware):

{instant_python-0.9.2 → instant_python-0.11.0}/instant_python/templates/boilerplate/fastapi/lifespan.py

@@ -4,7 +4,11 @@ from contextlib import asynccontextmanager
 
 from fastapi import FastAPI
 
+{% if template_infra_import %}
 from {{ general.source_name }}.{{ template_infra_import }}.alembic_migrator import AlembicMigrator
+{% else %}
+from {{ general.source_name }}.alembic_migrator import AlembicMigrator
+{% endif %}
 
 
 @asynccontextmanager

{instant_python-0.9.2 → instant_python-0.11.0}/instant_python/templates/boilerplate/github/release.yml

@@ -20,8 +20,10 @@ jobs:
     permissions:
       contents: write
     outputs:
-      released: ${{ steps.released.outputs.released }}
-      tag: ${{ steps.released.outputs.tag }}
+      released: {% raw %}${{ steps.released.outputs.released }}{% endraw %}
+
+      tag: {% raw %}${{ steps.released.outputs.tag }}{% endraw %}
+
 
     steps:
       - name: 🛡️ Harden runner
@@ -46,17 +48,23 @@ jobs:
           tag: true
           vcs_release: true
           config_file: pyproject.toml
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          git_committer_email: ${{ vars.GIT_COMMITTER_EMAIL }}
-          git_committer_name: ${{ vars.GIT_COMMITTER_NAME }}
-          ssh_public_signing_key: ${{ vars.SSH_PUBLIC_SIGNING_KEY }}
-          ssh_private_signing_key: ${{ secrets.SSH_PRIVATE_SIGNING_KEY }}
+          github_token: {% raw %}${{ secrets.GITHUB_TOKEN }}{% endraw %}
+
+          git_committer_email: {% raw %}${{ vars.GIT_COMMITTER_EMAIL }}{% endraw %}
+
+          git_committer_name: {% raw %}${{ vars.GIT_COMMITTER_NAME }}{% endraw %}
+
+          ssh_public_signing_key: {% raw %}${{ vars.SSH_PUBLIC_SIGNING_KEY }}{% endraw %}
+
+          ssh_private_signing_key: {% raw %}${{ secrets.SSH_PRIVATE_SIGNING_KEY }}{% endraw %}
+
 
   build-and-publish:
     name: Publish to PyPI
     needs:
       - release
-    if: needs.release.outputs.released == 'true'
+    if: {% raw %}needs.release.outputs.released == 'true'{% endraw %}
+
     runs-on: ubuntu-latest
     environment: release
     permissions:
@@ -73,7 +81,8 @@ jobs:
         with:
           fetch-depth: 0
           persist-credentials: false
-          ref: refs/tags/${{ needs.release.outputs.tag }}
+          ref: refs/tags/{% raw %}${{ needs.release.outputs.tag }}{% endraw %}
+
 
       - name: 🛠️ Setup environment
         uses: ./.github/actions/python_setup

{instant_python-0.9.2 → instant_python-0.11.0}/instant_python/templates/boilerplate/logger/file_logger.py

@@ -1,7 +1,11 @@
 {% set template_infra_import = "shared.infra"|compute_base_path(template.name) %}
 import logging
 
+{% if template_infra_import %}
 from {{ general.source_name }}.{{ template_infra_import }}.logger.file_rotating_handler import TimeRotatingFileHandler
+{% else %}
+from {{ general.source_name }}.logger.file_rotating_handler import TimeRotatingFileHandler
+{% endif %}
 
 
 class FileLogger:

{instant_python-0.9.2 → instant_python-0.11.0}/instant_python/templates/boilerplate/logger/file_rotating_handler.py

@@ -6,7 +6,11 @@ from logging.handlers import TimedRotatingFileHandler
 from pathlib import Path
 from typing import Self
 
+{% if template_infra_import %}
 from {{ general.source_name }}.{{ template_infra_import }}.logger.json_formatter import JSONFormatter
+{% else %}
+from {{ general.source_name }}.logger.json_formatter import JSONFormatter
+{% endif %}
 
 
 class TimeRotatingFileHandler(logging.Handler):

{instant_python-0.9.2 → instant_python-0.11.0}/instant_python/templates/boilerplate/persistence/alembic_migrator.py

@@ -1,7 +1,11 @@
 {% set template_infra_import = "shared.infra"|compute_base_path(template.name) %}
 import asyncio
 
+{% if template_infra_import %}
 from {{ general.source_name }}.{{ template_infra_import }}.persistence.sqlalchemy.postgres_settings import PostgresSettings
+{% else %}
+from {{ general.source_name }}.persistence.sqlalchemy.postgres_settings import PostgresSettings
+{% endif %}
 from alembic import command
 from alembic.config import Config
 

{instant_python-0.9.2 → instant_python-0.11.0}/instant_python/templates/boilerplate/persistence/async/async_engine_fixture.py

@@ -3,7 +3,11 @@ from collections.abc import AsyncGenerator
 import pytest
 from sqlalchemy.ext.asyncio import AsyncEngine, create_async_engine
 
+{% if template_infra_import %}
 from {{ general.source_name }}.{{ template_infra_import }}.persistence.sqlalchemy.postgres_settings import PostgresSettings
+{% else %}
+from {{ general.source_name }}.persistence.sqlalchemy.postgres_settings import PostgresSettings
+{% endif %}
 
 
 @pytest.fixture

{instant_python-0.9.2 → instant_python-0.11.0}/instant_python/templates/boilerplate/persistence/async/env.py

@@ -8,7 +8,11 @@ from sqlalchemy.engine import Connection
 from sqlalchemy.ext.asyncio import async_engine_from_config
 
 from migrations.models_metadata import base
+{% if template_infra_import %}
 from {{ general.source_name }}.{{ template_infra_import }}.persistence.sqlalchemy.postgres_settings import PostgresSettings
+{% else %}
+from {{ general.source_name }}.persistence.sqlalchemy.postgres_settings import PostgresSettings
+{% endif %}
 
 # this is the Alembic Config object, which provides
 # access to the values within the .ini file in use.

{instant_python-0.9.2 → instant_python-0.11.0}/instant_python/templates/boilerplate/persistence/async/models_metadata.py

@@ -6,6 +6,10 @@ have already been imported. To keep the env.py file clean, we import the Base.me
 needed models.
 """
 {% set template_infra_import = "shared.infra"|compute_base_path(template.name) %}
+{% if template_infra_import %}
 from {{ general.source_name }}.{{ template_infra_import }}.persistence.sqlalchemy.base import Base
+{% else %}
+from {{ general.source_name }}.persistence.sqlalchemy.base import Base
+{% endif %}
 
 base = Base

{instant_python-0.9.2 → instant_python-0.11.0}/instant_python/templates/boilerplate/persistence/async/sqlalchemy_repository.py

@@ -2,9 +2,17 @@
 {% set template_infra_import = "shared.infra"|compute_base_path(template.name) %}
 from typing import TypeVar
 
+{% if template_domain_import %}
 from {{ general.source_name }}.{{ template_domain_import }}.value_objects.uuid import Uuid
+{% else %}
+from {{ general.source_name }}.value_objects.uuid import Uuid
+{% endif %}
+{% if template_infra_import %}
 from {{ general.source_name }}.{{ template_infra_import }}.persistence.sqlalchemy.base import Base
-from sqlalchemy.ext.asyncio import AsyncEngine, AsyncSession, asynce_sessionmaker
+{% else %}
+from {{ general.source_name }}.persistence.sqlalchemy.base import Base
+{% endif %}
+from sqlalchemy.ext.asyncio import AsyncEngine, AsyncSession, async_sessionmaker
 
 
 Entity = TypeVar("Entity")
@@ -12,7 +20,7 @@ Entity = TypeVar("Entity")
 
 class SqlalchemyRepository[Model: Base]:
 	_model_class: type[Model]
-	_session_maker: asynce_sessionmaker[AssyncSession]
+	_session_maker: async_sessionmaker[AssyncSession]
 
 	def __init__(self, engine: AsyncEngine, model_class: type[Model]) -> None:
 		self._session_maker = async_sessionmaker(bind=engine)

{instant_python-0.9.2 → instant_python-0.11.0}/instant_python/templates/boilerplate/persistence/synchronous/session_maker.py

@@ -2,9 +2,15 @@
 from sqlalchemy import create_engine, Engine
 from sqlalchemy.orm import sessionmaker, Session
 
+{% if template_infra_import %}
 from {{ general.source_name }}.{{ template_infra_import }}.persistence.sqlalchemy.base import (
 	Base,
 )
+{% else %}
+from {{ general.source_name }}.persistence.sqlalchemy.base import (
+	Base,
+)
+{% endif %}
 
 
 class SessionMaker: