FastAPI-fastkit 1.2.0__py3-none-any.whl → 1.2.1__py3-none-any.whl

fastapi_fastkit/__init__.py

@@ -1 +1 @@
-__version__ = 'v1.2.0'
+__version__ = 'v1.2.1'

fastapi_fastkit/backend/main.py

@@ -185,6 +185,7 @@ def inject_project_metadata(
             description,
         )
         _process_config_file(core_modules.get("config", ""), project_name)
+        _process_main_file(core_modules.get("main", ""), project_name)
 
         print_success("Project metadata injected successfully")
 
@@ -235,6 +236,40 @@ def _process_setup_file(
         raise BackendExceptions(f"Failed to process setup.py: {e}")
 
 
+def _process_main_file(main_py: str, project_name: str) -> None:
+    """
+    Replace project name placeholders in the template main.py file.
+
+    Some templates (e.g. fastapi-single-module) inline the project name directly
+    in main.py rather than reading it from a settings module, so the placeholder
+    must be substituted here as well.
+
+    :param main_py: Path to main.py file
+    :param project_name: Project name
+    """
+    if not main_py or not os.path.exists(main_py):
+        return
+
+    try:
+        with open(main_py, "r", encoding="utf-8") as f:
+            content = f.read()
+
+        if "<project_name>" not in content:
+            return
+
+        content = content.replace("<project_name>", project_name)
+
+        with open(main_py, "w", encoding="utf-8") as f:
+            f.write(content)
+
+        debug_log("Injected project name into main.py", "info")
+        print_info("Injected project name into main.py")
+
+    except (OSError, UnicodeDecodeError) as e:
+        debug_log(f"Error processing main.py: {e}", "error")
+        raise BackendExceptions(f"Failed to process main.py: {e}")
+
+
 def _process_config_file(config_py: str, project_name: str) -> None:
     """
     Process config file and inject project name.

fastapi_fastkit/backend/package_managers/poetry_manager.py

@@ -4,7 +4,7 @@
 # @author bnbong bbbong9@gmail.com
 # --------------------------------------------------------------------------
 import subprocess
-from typing import List
+from typing import List, Tuple
 
 from fastapi_fastkit.core.exceptions import BackendExceptions
 from fastapi_fastkit.utils.logging import debug_log, get_logger
@@ -19,6 +19,47 @@ from .base import BasePackageManager
 
 logger = get_logger(__name__)
 
+# PEP 440 version specifier operators, longest-match first so "===" beats "==".
+_PEP440_OPERATORS = ("===", "==", "!=", "<=", ">=", "~=", "<", ">")
+
+
+def _parse_pip_requirement(
+    requirement: str,
+) -> Tuple[str, List[str], str, str]:
+    """Parse a pip/PEP 508 requirement string.
+
+    Returns ``(name, extras, version_spec, marker)`` where ``version_spec``
+    includes the operator (e.g. ``">=1.2.3"``) or is empty when unspecified,
+    and ``marker`` is the environment marker without the leading semicolon.
+    """
+    req = requirement.strip()
+
+    marker = ""
+    if ";" in req:
+        req, marker = req.split(";", 1)
+        req = req.strip()
+        marker = marker.strip()
+
+    version_spec = ""
+    split_at = len(req)
+    for op in _PEP440_OPERATORS:
+        idx = req.find(op)
+        if idx != -1 and idx < split_at:
+            split_at = idx
+    if split_at < len(req):
+        version_spec = req[split_at:].strip()
+        req = req[:split_at].strip()
+
+    extras: List[str] = []
+    if "[" in req and req.endswith("]"):
+        bare_name, _, extras_part = req.partition("[")
+        extras = [
+            extra.strip() for extra in extras_part[:-1].split(",") if extra.strip()
+        ]
+        req = bare_name.strip()
+
+    return req, extras, version_spec, marker
+
 
 class PoetryManager(BasePackageManager):
     """Poetry package manager implementation."""
@@ -182,15 +223,35 @@ build-backend = "poetry.core.masonry.api"
         pyproject_path = self.get_dependency_file_path()
 
         try:
-            # Create dependencies section for Poetry
+            # Create dependencies section for Poetry. Parse each requirement as
+            # PEP 508 so non-``==`` specifiers (``>=``, ``~=``, ...), extras, and
+            # environment markers all round-trip to valid TOML.
             deps_section = ""
             for dep in dependencies:
-                # Convert pip-style to poetry-style
-                if "==" in dep:
-                    name, version = dep.split("==", 1)
-                    deps_section += f'{name} = "{version}"\n'
+                name_part, extras, version_spec, marker = _parse_pip_requirement(dep)
+                if not name_part:
+                    continue
+
+                if not version_spec:
+                    version_str = "*"
+                elif version_spec.startswith("=="):
+                    # Poetry treats a bare version as a pin; keep the old
+                    # formatting to avoid churn in generated files.
+                    version_str = version_spec[2:].strip()
+                else:
+                    version_str = version_spec
+
+                if extras or marker:
+                    parts = [f'version = "{version_str}"']
+                    if extras:
+                        extras_str = ", ".join(f'"{extra}"' for extra in extras)
+                        parts.append(f"extras = [{extras_str}]")
+                    if marker:
+                        escaped_marker = marker.replace('"', '\\"')
+                        parts.append(f'markers = "{escaped_marker}"')
+                    deps_section += f"{name_part} = {{{', '.join(parts)}}}\n"
                 else:
-                    deps_section += f'{dep} = "*"\n'
+                    deps_section += f'{name_part} = "{version_str}"\n'
 
             # Create basic pyproject.toml content for Poetry
             pyproject_content = f"""[tool.poetry]

fastapi_fastkit/backend/project_builder/config_generator.py

@@ -488,7 +488,7 @@ class DynamicConfigGenerator:
         content.append("")
         content.append("# Run application")
         content.append(
-            "CMD ['uvicorn', 'src.main:app', '--host', '0.0.0.0', '--port', '8000']"
+            'CMD ["uvicorn", "src.main:app", "--host", "0.0.0.0", "--port", "8000"]'
         )
         content.append("")
 

fastapi_fastkit/cli.py

@@ -43,9 +43,28 @@ from fastapi_fastkit.utils.main import (
     validate_email,
 )
 
+from . import __version__
+
 console = utils_console
 
-from . import __version__
+
+def _cleanup_failed_project(
+    project_dir: str, user_workspace: str, create_project_folder: bool
+) -> None:
+    """
+    Clean up a partially created project after an error.
+
+    Only deletes a freshly created project folder. When the project was deployed
+    in-place (create_project_folder=False), project_dir equals the user's workspace,
+    and removing it would destroy unrelated files, so no cleanup is performed.
+    """
+    if not create_project_folder:
+        return
+    if not project_dir or not os.path.exists(project_dir):
+        return
+    if os.path.abspath(project_dir) == os.path.abspath(user_workspace):
+        return
+    shutil.rmtree(project_dir, ignore_errors=True)
 
 
 @click.group()
@@ -483,8 +502,7 @@ def init(
             if testing_type != "None":
                 test_config_content = generator.generate_test_config()
                 if test_config_content:
-                    test_config_path = os.path.join(project_dir, "tests", "conftest.py")
-                    os.makedirs(os.path.dirname(test_config_path), exist_ok=True)
+                    test_config_path = os.path.join(project_dir, "pytest.ini")
                     with open(test_config_path, "w") as f:
                         f.write(test_config_content)
 
@@ -492,9 +510,9 @@ def init(
             deployment = config.get("deployment", [])
             if deployment and deployment != ["None"]:
                 generator.generate_docker_files()
-                print_success(f"Generated Docker deployment files")
+                print_success("Generated Docker deployment files")
 
-            print_success(f"Generated configuration files for selected stack")
+            print_success("Generated configuration files for selected stack")
 
             # Create virtual environment and install dependencies
             venv_path = create_venv_with_manager(project_dir, package_manager)
@@ -514,8 +532,9 @@ def init(
                 logger = get_logger()
                 logger.exception(f"Error during project creation in init: {str(e)}")
             print_error(f"Error during project creation: {str(e)}")
-            if os.path.exists(project_dir):
-                shutil.rmtree(project_dir, ignore_errors=True)
+            _cleanup_failed_project(
+                project_dir, settings.USER_WORKSPACE, create_project_folder
+            )
 
         return
 
@@ -662,8 +681,9 @@ def init(
             logger = get_logger()
             logger.exception(f"Error during project creation in init: {str(e)}")
         print_error(f"Error during project creation: {str(e)}")
-        if os.path.exists(project_dir):
-            shutil.rmtree(project_dir, ignore_errors=True)
+        _cleanup_failed_project(
+            project_dir, settings.USER_WORKSPACE, create_project_folder
+        )
 
 
 @fastkit_cli.command()
@@ -930,9 +950,9 @@ def runserver(
         logger.exception(f"FileNotFoundError when starting server: {e}")
         if venv_python:
             print_error(
-                f"Failed to run Python from the virtual environment. Make sure uvicorn is installed in the project's virtual environment."
+                "Failed to run Python from the virtual environment. Make sure uvicorn is installed in the project's virtual environment."
             )
         else:
             print_error(
-                f"uvicorn not found. Make sure it's installed in your system Python."
+                "uvicorn not found. Make sure it's installed in your system Python."
             )

fastapi_fastkit/core/settings.py

@@ -102,7 +102,7 @@ class FastkitConfig:
             "MySQL": ["pymysql", "aiomysql", "sqlalchemy", "alembic"],
             "MongoDB": ["motor", "beanie"],
             "Redis": ["redis[hiredis]", "aioredis"],
-            "SQLite": ["sqlalchemy", "alembic"],
+            "SQLite": ["sqlalchemy", "aiosqlite", "alembic"],
             "None": [],
         },
         "authentication": {

{fastapi_fastkit-1.2.0.dist-info → fastapi_fastkit-1.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: FastAPI-fastkit
-Version: 1.2.0
+Version: 1.2.1
 Summary: Fast, easy-to-use starter kit for new users of Python and FastAPI
 Author-Email: bnbong <bbbong9@gmail.com>
 License: MIT
@@ -12,12 +12,13 @@ Requires-Python: >=3.12
 Requires-Dist: click>=8.1.7
 Requires-Dist: rich>=13.9.2
 Provides-Extra: dev
-Requires-Dist: pytest>=8.3.3; extra == "dev"
+Requires-Dist: pytest>=9.0.3; extra == "dev"
 Requires-Dist: pytest-cov>=6.2.1; extra == "dev"
-Requires-Dist: black>=24.10.0; extra == "dev"
+Requires-Dist: black>=26.3.1; extra == "dev"
 Requires-Dist: pre-commit>=4.0.1; extra == "dev"
 Requires-Dist: mypy>=1.12.0; extra == "dev"
 Requires-Dist: isort>=5.13.2; extra == "dev"
+Requires-Dist: pygments>=2.20.0; extra == "dev"
 Description-Content-Type: text/markdown
 
 <p align="center">
@@ -36,6 +37,9 @@ Description-Content-Type: text/markdown
 <a href="https://codecov.io/gh/bnbong/FastAPI-fastkit" >
     <img src="https://codecov.io/gh/bnbong/FastAPI-fastkit/graph/badge.svg?token=WS0B6WWD8K"/>
 </a>
+<a href="https://pepy.tech/project/fastapi-fastkit">
+    <img src="https://static.pepy.tech/personalized-badge/fastapi-fastkit?period=total&units=INTERNATIONAL_SYSTEM&left_color=BLACK&right_color=GREEN&left_text=downloads" alt="PyPI Downloads">
+</a>
 </p>
 
 ---
@@ -47,6 +51,7 @@ This project was inspired by the `SpringBoot initializer` & Python Django's `dja
 ## Key Features
 
 - **⚡ Immediate FastAPI project creation** : Super-fast FastAPI workspace & project creation via CLI, inspired by `django-admin` feature of [Python Django](https://github.com/django/django)
+- **✨ Interactive project builder**: Guided step-by-step feature selection for databases, authentication, caching, monitoring, and more with auto-generated code
 - **🎨 Prettier CLI output** : Beautiful CLI experience powered by [rich library](https://github.com/Textualize/rich)
 - **📋 Standards-based FastAPI project templates** : Templates follow Python standards and common FastAPI patterns.
 - **🔍 Automated template quality assurance** : Weekly automated testing ensures all templates remain functional and up-to-date
@@ -79,6 +84,28 @@ fastkit init [OPTIONS]
   - `--package-manager` [pip|uv|pdm|poetry]
   - Stack selection: `minimal` | `standard` | `full` (interactive)
 
+### Create a project with interactive mode
+```console
+fastkit init --interactive
+```
+- What it does: Guided step-by-step project setup with intelligent feature selection
+- Features:
+  - **Database selection**: PostgreSQL, MySQL, MongoDB, Redis, SQLite
+  - **Authentication**: JWT, OAuth2, FastAPI-Users, Session-based
+  - **Background tasks**: Celery, Dramatiq
+  - **Caching**: Redis, fastapi-cache2
+  - **Monitoring**: Loguru, OpenTelemetry, Prometheus
+  - **Testing**: Basic (pytest), Coverage, Advanced (with faker, factory-boy)
+  - **Utilities**: CORS, Rate-Limiting, Pagination, WebSocket
+  - **Deployment**: Docker, docker-compose with auto-generated configs
+  - **Package manager**: pip, uv, pdm, poetry
+  - **Custom packages**: Add your own dependencies
+- Auto-generates:
+  - `main.py` with selected features integrated
+  - Database and authentication configuration files
+  - Docker deployment files (Dockerfile, docker-compose.yml)
+  - Test configuration (pytest with coverage)
+
 ### Create a project from a template
 ```console
 fastkit startdemo [TEMPLATE] [OPTIONS]

{fastapi_fastkit-1.2.0.dist-info → fastapi_fastkit-1.2.1.dist-info}/RECORD

@@ -1,8 +1,8 @@
-fastapi_fastkit-1.2.0.dist-info/METADATA,sha256=iZblXw6CUHthMi-Sr8UqGt7Pio4j-c91YGvVtTbWPKc,7670
-fastapi_fastkit-1.2.0.dist-info/WHEEL,sha256=tsUv_t7BDeJeRHaSrczbGeuK-TtDpGsWi_JfpzD255I,90
-fastapi_fastkit-1.2.0.dist-info/entry_points.txt,sha256=IONmgb7zWPnJWsCOcpF3u1yP6AWnPjrgWIv49mr1DZE,76
-fastapi_fastkit-1.2.0.dist-info/licenses/LICENSE,sha256=2a9cYM3Uy8DW-so6zpYaqUafYT1Dznd3OCWCFe5CKNA,1066
-fastapi_fastkit/__init__.py,sha256=3fYvbK3reCGZv6LR-d0_6tSw-leXYFt3SadePKQDefo,23
+fastapi_fastkit-1.2.1.dist-info/METADATA,sha256=ss4JwBYGr5g56XsTNQM6KqnGQSSYcSj-cUweDQq7sjI,9118
+fastapi_fastkit-1.2.1.dist-info/WHEEL,sha256=Z36eTX6lG3PITRleSd5hAZHCcz52yg3c0JQVxKBbLW0,90
+fastapi_fastkit-1.2.1.dist-info/entry_points.txt,sha256=IONmgb7zWPnJWsCOcpF3u1yP6AWnPjrgWIv49mr1DZE,76
+fastapi_fastkit-1.2.1.dist-info/licenses/LICENSE,sha256=2a9cYM3Uy8DW-so6zpYaqUafYT1Dznd3OCWCFe5CKNA,1066
+fastapi_fastkit/__init__.py,sha256=n28YDgLpCC7wZf_uB1xeqKSCdyKmIwYrD_UCvLQnHPc,23
 fastapi_fastkit/__main__.py,sha256=-FS9yUe4IEgDbJjFC1xso-pFCxRzUJ447j6bYpsBTBM,271
 fastapi_fastkit/backend/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fastapi_fastkit/backend/inspector.py,sha256=kiQbFko8kHW65LgRMpiuaru__Tsn_3FOx5CwtKSGt9c,51029
@@ -11,22 +11,22 @@ fastapi_fastkit/backend/interactive/config_builder.py,sha256=KgLTVG9VBZVGA5b2IKC
 fastapi_fastkit/backend/interactive/prompts.py,sha256=bXwXk-PnKsss8AQecf5NxTFUOTU7YU1QrjJYfLHo8_w,15343
 fastapi_fastkit/backend/interactive/selectors.py,sha256=fa1nKhPok6iqi0lsC3fzrlHYomTcRtdHJFF19fe43R4,7377
 fastapi_fastkit/backend/interactive/validators.py,sha256=WaRWuE6H2qQ5UExmHq3NQ41spiCyhbyk7QlYVXcfoHw,4651
-fastapi_fastkit/backend/main.py,sha256=weHSZ5Kd5sxy7d39S3ELb5lR2Wl8Vf2pGHy4Imy7_5A,29761
+fastapi_fastkit/backend/main.py,sha256=xEubuHrTzRGXZ2VwCMV7Wmyn0LSSthHLEt4F48rBDBs,30942
 fastapi_fastkit/backend/package_managers/__init__.py,sha256=awSaY-pInI9K4mk1aWqdyKk143AGrcPI4NCy5l_48vw,691
 fastapi_fastkit/backend/package_managers/base.py,sha256=6IZmIgEgySocVRKH36ffyEMDrnyDYGR3vye7tFjCSRA,4644
 fastapi_fastkit/backend/package_managers/factory.py,sha256=sfmsAO3WC1IbehQRrAuJx3pDUtfvz3OZEMzd0kkDiZM,5452
 fastapi_fastkit/backend/package_managers/pdm_manager.py,sha256=5UF2XtSJB5vjTeG4NoziZT8HgMbNfSdJeALGm6sIN6Y,9938
 fastapi_fastkit/backend/package_managers/pip_manager.py,sha256=hNzGIH3WxKUOS9FLcRBe9DANGz4iYaBKUSwZOR8KQm0,8061
-fastapi_fastkit/backend/package_managers/poetry_manager.py,sha256=1wdf090w-n5JhSNlR66drI3JXSqUtO3FuzAEqlKihVw,14242
+fastapi_fastkit/backend/package_managers/poetry_manager.py,sha256=S4RhLHIKVpDq5knaC18vhDkfNjd129uWqXCIeBVE3lw,16596
 fastapi_fastkit/backend/package_managers/uv_manager.py,sha256=F9oXnKgjd-fgLmB6-H9lWZVnMcf_psXyQNCQ3O45BCc,12410
 fastapi_fastkit/backend/project_builder/__init__.py,sha256=Y_0G3duIEyTtlJMAN7VgK4ufCNxCNKXnkT0u7QCldCI,574
-fastapi_fastkit/backend/project_builder/config_generator.py,sha256=8nyW0ODNwUgMePbIpfhj9UIqAvCnTfDIlrq10Yc3TKE,23100
+fastapi_fastkit/backend/project_builder/config_generator.py,sha256=3e7F8DcwvW25Rj2l6Cc9rPKEjpEOcznVYHQXPPFbIao,23100
 fastapi_fastkit/backend/project_builder/dependency_collector.py,sha256=stQ77W7LUfsiKyyl3ggynC90Pd0UYFnW1xTrb-y286w,6419
 fastapi_fastkit/backend/transducer.py,sha256=rIqwJCm5nsruw3qYZYSEoevqOXoKs38MLAmexAM3O7Y,7171
-fastapi_fastkit/cli.py,sha256=mOrhr3tHkRQ2M3HrYPyUJ06fnjLpN2PgOyPuUBC2asI,30923
+fastapi_fastkit/cli.py,sha256=60FZTMT9ulTwMthJsM0-WMJHKvcZiCK9JMAor9XH5-k,31556
 fastapi_fastkit/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fastapi_fastkit/core/exceptions.py,sha256=W29lbDlKE_yKdS-m_QHaWdDB1j3yGge6mVx5mo_jLrU,972
-fastapi_fastkit/core/settings.py,sha256=WdMjQaWxhB6CKEQ8s9b34xwhbYAyvX5yetvdNs-N9a8,8811
+fastapi_fastkit/core/settings.py,sha256=lSb4S9rf8zVSD1KFXGP6o0BjZUPnu4wzviNp2KVZkIY,8824
 fastapi_fastkit/fastapi_project_template/PROJECT_README_TEMPLATE.md,sha256=5lT_ZY1QItTDbhKYNY6KlOoGlbSTBSrs9DJthcle3D4,1529
 fastapi_fastkit/fastapi_project_template/README.md,sha256=7urtQfEjWkX8tSnG_f28_z_kgB8Gjy-W4NxqN8M-df8,2637
 fastapi_fastkit/fastapi_project_template/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -253,4 +253,4 @@ fastapi_fastkit/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fastapi_fastkit/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fastapi_fastkit/utils/logging.py,sha256=oU7BnWInxzl_Gk8kGQ0f6cKdNHZcOVVcSHY4I9MTmR8,6431
 fastapi_fastkit/utils/main.py,sha256=iL1_dM2L2LLfGH9QvKhiup9wiBISrpDkJbXPSn1MJyE,9298
-fastapi_fastkit-1.2.0.dist-info/RECORD,,
+fastapi_fastkit-1.2.1.dist-info/RECORD,,

{fastapi_fastkit-1.2.0.dist-info → fastapi_fastkit-1.2.1.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: pdm-backend (2.4.6)
+Generator: pdm-backend (2.4.8)
 Root-Is-Purelib: true
 Tag: py3-none-any