ohmyapi 0.1.4__py3-none-any.whl → 0.1.6__py3-none-any.whl

ohmyapi/core/runtime.py

@@ -15,67 +15,6 @@ from fastapi import FastAPI, APIRouter
 from ohmyapi.db.model import Model
 
 
-class App:
-    """App container holding runtime data like detected models and routes."""
-
-    def __init__(self, project: "OhMyAPI Project", name: str):
-        self.project = project
-        self.name = name
-
-        # The list of module paths (e.g. "ohmyapi_auth.models") for Tortoise and Aerich
-        self.model_modules: List[str] = []
-
-        # The APIRouter
-        self.router: Optional[APIRouter] = None
-
-        # Import the app, so its __init__.py runs.
-        importlib.import_module(self.name)
-
-        # Load the models
-        try:
-            models_mod = importlib.import_module(f"{self.name}.models")
-            self.model_modules.append(f"{self.name}.models")
-        except ModuleNotFoundError:
-            pass
-
-        # Locate the APIRouter
-        try:
-            routes_mod = importlib.import_module(f"{self.name}.routes")
-            router = getattr(routes_mod, "router", None)
-            if isinstance(router, APIRouter):
-                self.router = router
-        except ModuleNotFoundError:
-            pass
-
-    def __repr__(self):
-        out = ""
-        out += f"App: {self.name}\n"
-        out += f"Models:\n"
-        for model in self.models:
-            out += f" - {model.__name__}\n"
-        out += "Routes:\n"
-        for route in (self.routes or []):
-            out += f" - {route}\n"
-        return out
-
-    def __str__(self):
-        return self.__repr__()
-
-    @property
-    def models(self) -> List[Model]:
-        models: List[Model] = []
-        for mod in self.model_modules:
-            models_mod = importlib.import_module(mod)
-            for obj in models_mod.__dict__.values():
-                if isinstance(obj, type) and getattr(obj, "_meta", None) is not None and obj.__name__ != 'Model':
-                    models.append(obj)
-        return models
-
-    @property
-    def routes(self):
-        return self.router.routes
-
-
 class Project:
     """
     Project runtime loader + Tortoise/Aerich integration.
@@ -244,3 +183,65 @@ class Project:
                     # No migrations yet, initialize then retry upgrade
                     await c.init_db(safe=True)
                     await c.upgrade()
+
+
+class App:
+    """App container holding runtime data like detected models and routes."""
+
+    def __init__(self, project: Project, name: str):
+        self.project = project
+        self.name = name
+
+        # The list of module paths (e.g. "ohmyapi_auth.models") for Tortoise and Aerich
+        self.model_modules: List[str] = []
+
+        # The APIRouter
+        self.router: Optional[APIRouter] = None
+
+        # Import the app, so its __init__.py runs.
+        importlib.import_module(self.name)
+
+        # Load the models
+        try:
+            models_mod = importlib.import_module(f"{self.name}.models")
+            self.model_modules.append(f"{self.name}.models")
+        except ModuleNotFoundError:
+            pass
+
+        # Locate the APIRouter
+        try:
+            routes_mod = importlib.import_module(f"{self.name}.routes")
+            router = getattr(routes_mod, "router", None)
+            if isinstance(router, APIRouter):
+                self.router = router
+        except ModuleNotFoundError:
+            pass
+
+    def __repr__(self):
+        out = ""
+        out += f"App: {self.name}\n"
+        out += f"Models:\n"
+        for model in self.models:
+            out += f" - {model.__name__}\n"
+        out += "Routes:\n"
+        for route in (self.routes or []):
+            out += f" - {route}\n"
+        return out
+
+    def __str__(self):
+        return self.__repr__()
+
+    @property
+    def models(self) -> List[Model]:
+        models: List[Model] = []
+        for mod in self.model_modules:
+            models_mod = importlib.import_module(mod)
+            for obj in models_mod.__dict__.values():
+                if isinstance(obj, type) and getattr(obj, "_meta", None) is not None and obj.__name__ != 'Model':
+                    models.append(obj)
+        return models
+
+    @property
+    def routes(self):
+        return self.router.routes
+

ohmyapi/core/scaffolding.py

@@ -55,7 +55,7 @@ def startapp(name: str, project: str):
     """Create a new app inside a project: templates go into <project_dir>/<name>/"""
     target_dir = Path(project)
     os.makedirs(target_dir, exist_ok=True)
-    render_template_dir("app", target_dir, {"project_name": project, "app_name": name}, subdir_name=name)
+    render_template_dir("app", target_dir, {"project_name": target_dir.resolve().name, "app_name": name}, subdir_name=name)
     print(f"✅ App '{name}' created in project '{target_dir}' successfully.")
     print(f"🔧 Remember to add '{name}' to your INSTALLED_APPS!")
 

ohmyapi/core/templates/app/models.py.j2

@@ -1,6 +1,6 @@
 from ohmyapi.db import Model, field
 
 
-class MyModel(Model):
-    id: int = field.IntField(min=1, pk=True)
-    ...
+# class MyModel(Model):
+#     id: int = field.IntField(min=1, pk=True)
+#     ...

ohmyapi/core/templates/project/settings.py.j2

@@ -1,5 +1,7 @@
 # {{ project_name }} settings.py
 PROJECT_NAME = "MyProject"
 DATABASE_URL = "sqlite://db.sqlite3"
-INSTALLED_APPS = []
+INSTALLED_APPS = [
+  #'ohmyapi_auth',
+]
 

{ohmyapi-0.1.4.dist-info → ohmyapi-0.1.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ohmyapi
-Version: 0.1.4
+Version: 0.1.6
 Summary: A Django-like but async web-framework based on FastAPI and TortoiseORM.
 License-Expression: MIT
 Keywords: fastapi,tortoise,orm,async,web-framework

{ohmyapi-0.1.4.dist-info → ohmyapi-0.1.6.dist-info}/RECORD

@@ -5,19 +5,18 @@ ohmyapi/builtin/auth/permissions.py,sha256=gPBf01UNgXjU3v3DwMSYpKjayZSnwksp-ji4C
 ohmyapi/builtin/auth/routes.py,sha256=5jLq92z4TJw4eyiIJ5t7MwRNtYlpN7suDwW28JeEQYA,4902
 ohmyapi/cli.py,sha256=DaSf1uYxv1bD1XBwVN_rn4F7hq9AlvXwtWzbVw7WPBw,3472
 ohmyapi/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ohmyapi/core/runtime.py,sha256=GmY3GpJRupDA8-54FHF-nyzmRaa4muDflySlC6-XQIA,8586
-ohmyapi/core/scaffolding.py,sha256=KsV2uNX3hSRYutLmu3IhPjVTQTMnxwGqxbJij-fhGGk,2554
+ohmyapi/core/runtime.py,sha256=l5zffc4VTwQOo7G9mfiYHsPGapMONRX_jtO_z9QaKHU,8577
+ohmyapi/core/scaffolding.py,sha256=iMymscokJ-YqzB0ZTC-gcc2T71o73577j9tnb2x8lH8,2572
 ohmyapi/core/templates/app/__init__.py.j2,sha256=QwVIQVUGZVhdH1d4NrvL7NTsK4-T4cihzYs8UVX2dt4,43
-ohmyapi/core/templates/app/models.py.j2,sha256=X0btKhxTUPAv8E1HQm14tcqXIIhrKobPjrNdpOXNOqk,113
+ohmyapi/core/templates/app/models.py.j2,sha256=_3w-vFJ5fgsmncsCv34k_wyCMF78jufbSSglns4gbb0,119
 ohmyapi/core/templates/app/routes.py.j2,sha256=Ee3xeVdM_G5-TRw14_C6siJTrEXtnRUD5xhcHCbu5QA,229
 ohmyapi/core/templates/project/pyproject.toml.j2,sha256=rk5baSS-nhW2mbdl60CHoXmeTBkqnzUEMwrRNxUnkt4,250
-ohmyapi/core/templates/project/settings.py.j2,sha256=c8hHo5DHxNLtam_8Sk8bLYxrjhgegwpk_Rt6UFPiZRY,118
+ohmyapi/core/templates/project/settings.py.j2,sha256=RBKGB8MZWPM3Bp0a57Y1YrSvSXxh502TUnJqbbu48Ig,138
 ohmyapi/db/__init__.py,sha256=p5oXqYUKT6eAoE-9JD-p6zKo9s-H84rJbrKxFna8Kvc,63
-ohmyapi/db/migration_manager.py,sha256=dTabeDyd6ZIa0lORlKRuiLnBTcsVAgUjgrO9_bew6pQ,3621
 ohmyapi/db/model/__init__.py,sha256=owKYpx5a2ZFTBgBqyEKN09AvY1cSP0dy1O7d3_sUVgM,33
 ohmyapi/db/model/model.py,sha256=PSzK_d8IZQExSRuTrEyPnqfa4GENQhbBZsVxxLWTR4g,1570
 ohmyapi/router.py,sha256=RzDXrtJJrk4eWdt9qoKBfz6g0S5WZq2hDQoFy5whR6A,40
-ohmyapi-0.1.4.dist-info/METADATA,sha256=MoXGVAZlEAlxPpHNMgnoDKD9BsNOQ7uJW8entVmYAvs,4268
-ohmyapi-0.1.4.dist-info/WHEEL,sha256=M5asmiAlL6HEcOq52Yi5mmk9KmTVjY2RDPtO4p9DMrc,88
-ohmyapi-0.1.4.dist-info/entry_points.txt,sha256=ZCZJLw_ojguyr1WOmb8UwHrr42hiLj6-Kzh4mMa_7Ns,44
-ohmyapi-0.1.4.dist-info/RECORD,,
+ohmyapi-0.1.6.dist-info/METADATA,sha256=aLe3O1xcYRb-a_WG6w4QkWxneATuaHjdmWZezxBcxhw,4268
+ohmyapi-0.1.6.dist-info/WHEEL,sha256=M5asmiAlL6HEcOq52Yi5mmk9KmTVjY2RDPtO4p9DMrc,88
+ohmyapi-0.1.6.dist-info/entry_points.txt,sha256=ZCZJLw_ojguyr1WOmb8UwHrr42hiLj6-Kzh4mMa_7Ns,44
+ohmyapi-0.1.6.dist-info/RECORD,,

ohmyapi/db/migration_manager.py

@@ -1,90 +0,0 @@
-import asyncio
-from pathlib import Path
-from aerich import Command
-from ohmyapi.core import runtime
-
-
-class MigrationManager:
-    def __init__(self, project):
-        self.project = project
-        self._commands = {}
-        # Compute tortoise_config grouped by app module
-        self._tortoise_config = self._build_tortoise_config()
-
-    def _build_tortoise_config(self) -> dict:
-        """
-        Build Tortoise config from the flat model_registry,
-        grouping models by app module for Aerich compatibility.
-        """
-        db_url = self.project.settings.DATABASE_URL
-        registry = self.project.model_registry  # flat: model_path -> class
-
-        apps_modules = {}
-        for model_path, model_cls in registry.items():
-            if not isinstance(model_cls, type):
-                raise TypeError(f"Registry value must be a class, got {type(model_cls)}: {model_cls}")
-            # Extract app module by removing the model class name
-            # Example: 'ohmyapi.apps.auth.User' -> 'ohmyapi.apps.auth'
-            app_module = ".".join(model_path.split(".")[:-1])
-            apps_modules.setdefault(app_module, []).append(model_cls)
-
-        # Build Tortoise config
-        apps_config = {}
-        for app_module, models in apps_modules.items():
-            modules_set = set(m.__module__ for m in models)
-            apps_config[app_module] = {
-                "models": list(modules_set),
-                "default_connection": "default",
-            }
-
-        return {
-            "connections": {"default": db_url},
-            "apps": apps_config,
-        }
-
-    def get_apps(self):
-        """Return app modules extracted from the registry"""
-        return list(self._tortoise_config["apps"].keys())
-
-    def get_migration_location(self, app_module: str) -> str:
-        """Return the path to the app's migrations folder"""
-        try:
-            module = __import__(app_module, fromlist=["migrations"])
-            if not hasattr(module, "__file__") or module.__file__ is None:
-                raise ValueError(f"Cannot determine filesystem path for app '{app_module}'")
-            app_path = Path(module.__file__).parent
-            migrations_path = app_path / "migrations"
-            migrations_path.mkdir(exist_ok=True)
-            return str(migrations_path)
-        except ModuleNotFoundError:
-            raise ValueError(f"App module '{app_module}' cannot be imported")
-
-    async def init_app_command(self, app_module: str) -> Command:
-        """Initialize Aerich command for a specific app module"""
-        location = self.get_migration_location(app_module)
-        cmd = Command(
-            tortoise_config=self._tortoise_config,
-            app=app_module,
-            location=location,
-        )
-        await cmd.init()
-        self._commands[app_module] = cmd
-        return cmd
-
-    async def makemigrations(self, app_module: str):
-        """Generate migrations for a specific app"""
-        cmd = self._commands.get(app_module) or await self.init_app_command(app_module)
-        await cmd.migrate()
-
-    async def migrate(self, app_module: str = None):
-        """Apply migrations. If app_module is None, migrate all apps"""
-        apps_to_migrate = [app_module] if app_module else self.get_apps()
-        for app in apps_to_migrate:
-            cmd = self._commands.get(app) or await self.init_app_command(app)
-            await cmd.upgrade()
-
-    async def show_migrations(self, app_module: str):
-        """List migrations for an app"""
-        cmd = self._commands.get(app_module) or await self.init_app_command(app_module)
-        await cmd.history()
-