ohmyapi 0.2.7__tar.gz → 0.3.0__tar.gz

{ohmyapi-0.2.7 → ohmyapi-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ohmyapi
-Version: 0.2.7
+Version: 0.3.0
 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.7 → ohmyapi-0.3.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ohmyapi"
-version = "0.2.7"
+version = "0.3.0"
 description = "Django-flavored scaffolding and management layer around FastAPI, Pydantic, TortoiseORM and Aerich migrations"
 license = "MIT"
 keywords = ["fastapi", "tortoise", "orm", "pydantic", "async", "web-framework"]

ohmyapi-0.3.0/src/ohmyapi/__init__.py

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

{ohmyapi-0.2.7 → ohmyapi-0.3.0}/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):
     """
@@ -41,6 +47,7 @@ def serve(root: str = ".", host="127.0.0.1", port=8000):
 
 @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.7 → ohmyapi-0.3.0}/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.3.0/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.3.0/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.7 → ohmyapi-0.3.0}/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.7 → ohmyapi-0.3.0}/src/ohmyapi/db/model/model.py

@@ -34,6 +34,23 @@ class ModelMeta(type(TortoiseModel)):
         # Grab the Schema class for further processing.
         schema_opts = attrs.get("Schema", None)
 
+        # Create or get the inner Meta class
+        meta = attrs.get("Meta", type("Meta", (), {}))
+
+        # Infer app name from module if not explicitly set
+        if not hasattr(meta, "app"):
+            module = attrs.get("__module__", "")
+            module_parts = module.split(".")
+            if module_parts[-1] == "models":
+                inferred_app = module_parts[-2]
+            else:
+                inferred_app = module_parts[-1]
+            meta.app = inferred_app
+
+        # Prefix table name if not explicitly set
+        if not hasattr(meta, "table"):
+            meta.table = f"{meta.app}_{name.lower()}"
+
         # Let Tortoise's Metaclass do it's thing.
         new_cls = super().__new__(mcls, name, bases, attrs)
 

ohmyapi-0.2.7/src/ohmyapi/__init__.py

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