ohmyapi 0.2.5__tar.gz → 0.2.8__tar.gz

{ohmyapi-0.2.5 → ohmyapi-0.2.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ohmyapi
-Version: 0.2.5
+Version: 0.2.8
 Summary: Django-flavored scaffolding and management layer around FastAPI, Pydantic, TortoiseORM and Aerich migrations
 License-Expression: MIT
 Keywords: fastapi,tortoise,orm,pydantic,async,web-framework

{ohmyapi-0.2.5 → ohmyapi-0.2.8}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ohmyapi"
-version = "0.2.5"
+version = "0.2.8"
 description = "Django-flavored scaffolding and management layer around FastAPI, Pydantic, TortoiseORM and Aerich migrations"
 license = "MIT"
 keywords = ["fastapi", "tortoise", "orm", "pydantic", "async", "web-framework"]
@@ -43,6 +43,19 @@ ohmyapi = "ohmyapi.cli:app"
 [project.urls]
 repository = "https://code.c-base.org/baccenfutter/ohmyapi"
 
+[build-system]
+requires = [
+    "poetry-core>=1.8.0",
+    "poetry-dynamic-versioning>=1.8.0"
+]
+build-backend = "poetry_dynamic_versioning.backend"
+
+[tool.poetry-dynamic-versioning]
+enable = true
+source = "file"
+path = "src/ohmyapi/__init__.py"
+pattern = "__VERSION__\\s*=\\s*['\"](?P<version>[^'\"]+)['\"]"
+
 [tool.black]
 line-length = 88
 target-version = ['py39', 'py310', 'py311', 'py312', 'py313']

ohmyapi-0.2.8/src/ohmyapi/__init__.py

@@ -0,0 +1 @@
+__VERSION__ = "0.2.8"

{ohmyapi-0.2.5 → ohmyapi-0.2.8}/src/ohmyapi/cli.py

@@ -27,6 +27,12 @@ def startapp(app_name: str, root: str = "."):
     scaffolding.startapp(app_name, root)
 
 
+@app.command()
+def dockerize(root: str = "."):
+    """Create template Dockerfile and docker-compose.yml."""
+    scaffolding.copy_static("docker", root)
+
+
 @app.command()
 def serve(root: str = ".", host="127.0.0.1", port=8000):
     """
@@ -35,11 +41,13 @@ def serve(root: str = ".", host="127.0.0.1", port=8000):
     project_path = Path(root)
     project = runtime.Project(project_path)
     app_instance = project.app()
+    app_instance = project.configure_app(app_instance)
     uvicorn.run(app_instance, host=host, port=int(port), reload=False)
 
 
 @app.command()
 def shell(root: str = "."):
+    """An interactive shell with your loaded project runtime."""
     project_path = Path(root).resolve()
     project = runtime.Project(project_path)
 

{ohmyapi-0.2.5 → ohmyapi-0.2.8}/src/ohmyapi/core/runtime.py

@@ -72,23 +72,35 @@ class Project:
     def is_app_installed(self, name: str) -> bool:
         return name in getattr(self.settings, "INSTALLED_APPS", [])
 
-    def app(self, generate_schemas: bool = False) -> FastAPI:
+    def app(self,
+            docs_url: str = "/docs",
+    ) -> FastAPI:
         """
-        Create a FastAPI app, attach all APIRouters from registered apps,
-        and register ORM lifecycle event handlers.
+        Create and return a FastAPI app.
         """
-        app = FastAPI(title=getattr(self.settings, "PROJECT_NAME", "OhMyAPI Project"))
+        import ohmyapi
+        return FastAPI(
+            title=getattr(self.settings, "PROJECT_NAME", "OhMyAPI Project"),
+            description=getattr(self.settings, "PROJECT_DESCRIPTION", ""),
+            docs_url=getattr(self.settings, "DOCS_URL", "/docs"),
+            version=ohmyapi.__VERSION__,
+        )
 
-        # Attach routers from apps
+    def configure_app(self, app: FastAPI) -> FastAPI:
+        """
+        Attach project routes and event handlers to given FastAPI instance.
+        """
+        # Attach project routes.
         for app_name, app_def in self._apps.items():
             for router in app_def.routers:
                 app.include_router(router)
 
-        # Startup / shutdown events
+        # Initialize ORM on startup
         @app.on_event("startup")
         async def _startup():
-            await self.init_orm(generate_schemas=generate_schemas)
+            await self.init_orm(generate_schemas=False)
 
+        # Close ORM on shutdown
         @app.on_event("shutdown")
         async def _shutdown():
             await self.close_orm()

{ohmyapi-0.2.5 → ohmyapi-0.2.8}/src/ohmyapi/core/scaffolding.py

@@ -2,6 +2,8 @@ from pathlib import Path
 
 from jinja2 import Environment, FileSystemLoader
 
+import shutil
+
 # Base templates directory
 TEMPLATE_DIR = Path(__file__).parent / "templates"
 env = Environment(loader=FileSystemLoader(str(TEMPLATE_DIR)))
@@ -53,6 +55,26 @@ def render_template_dir(
             render_template_file(template_dir / template_rel_path, context, output_path)
 
 
+def copy_static(dir_name: str, target_dir: Path):
+    """Statically copy all files from {TEMPLATE_DIR}/{dir_name} to target_dir."""
+    template_dir = TEMPLATE_DIR / dir_name
+    target_dir = Path(target_dir)
+    if not template_dir.exists():
+        print(f"no templates found under: {dir_name}")
+        return
+
+    for root, _, files in template_dir.walk():
+        root_path = Path(root)
+        for file in files:
+            src = root_path / file
+            dst = target_dir / file
+            if dst.exists():
+                print(f"⛔ File exists, skipping: {dst}")
+                continue
+            shutil.copy(src, ".")
+    print(f"✅ Templates created successfully.")
+    print(f"🔧 Next, run `docker compose up -d --build`")
+
 def startproject(name: str):
     """Create a new project: flat structure, all project templates go into <name>/"""
     target_dir = Path(name).resolve()

ohmyapi-0.2.8/src/ohmyapi/core/templates/docker/Dockerfile

@@ -0,0 +1,30 @@
+FROM python:3.13-alpine
+
+ENV PYTHONDONTWRITEBYTECODE=1 \
+    PYTHONUNBUFFERED=1 \
+    POETRY_HOME="/opt/poetry" \
+    POETRY_VIRTUALENVS_IN_PROJECT=true \
+    POETRY_NO_INTERACTION=1
+
+RUN apk add --no-cache \
+    build-base \
+    curl \
+    git \
+    bash \
+    libffi-dev \
+    openssl-dev \
+    python3-dev \
+    musl-dev
+
+RUN curl -sSL https://install.python-poetry.org | python3 -
+ENV PATH="$POETRY_HOME/bin:$PATH"
+
+WORKDIR /app
+COPY pyproject.toml poetry.lock* /app/
+RUN poetry lock
+RUN poetry install
+COPY . /app
+
+EXPOSE 8000
+
+CMD ["poetry", "run", "ohmyapi", "serve", "--host", "0.0.0.0"]

ohmyapi-0.2.8/src/ohmyapi/core/templates/docker/docker-compose.yml

@@ -0,0 +1,7 @@
+services:
+  app:
+    build:
+      context: .
+    restart: unless-stopped
+    ports:
+      - 8000:8000

{ohmyapi-0.2.5 → ohmyapi-0.2.8}/src/ohmyapi/core/templates/project/pyproject.toml.j2

@@ -10,7 +10,7 @@ readme = "README.md"
 license = { text = "MIT" }
 
 dependencies = [
-    "ohmyapi (>=0.1.0,<0.2.0)"
+    "ohmyapi"
 ]
 
 [tool.poetry.group.dev.dependencies]

ohmyapi-0.2.5/src/ohmyapi/__init__.py

@@ -1 +0,0 @@
-from . import db