mountaineer 0.9.0.dev5__tar.gz → 0.9.0.dev6__tar.gz

{mountaineer-0.9.0.dev5 → mountaineer-0.9.0.dev6}/.github/scripts/__tests__/test_update_version.py

@@ -127,3 +127,52 @@ def test_update_version_python(tmp_path: Path):
         version = "^0.27.0.post1"
         """,
     )
+
+
+def test_update_version_python_with_project_version(tmp_path: Path):
+    pyproject_text = """
+        [tool.poetry]
+        name = "mountaineer"
+        version = "0.1.0"
+        description = ""
+        readme = "README.md"
+
+        [project]
+        name = "mountaineer"
+        version = "0.1.0"
+        description = ""
+
+        [tool.poetry.dependencies]
+        uvicorn = { extras = ["standard"], version = "^0.27.0.post1" }
+        fastapi = "^0.68.0"
+        """
+
+    pyproject_path = tmp_path / "pyproject.toml"
+    pyproject_path.write_text(pyproject_text)
+
+    with change_pwd(tmp_path):
+        update_version_python("0.2.0")
+
+    assert sub(r"\s+", "", pyproject_path.read_text()) == sub(
+        r"\s+",
+        "",
+        """
+        [tool.poetry]
+        name = "mountaineer"
+        version = "0.2.0"
+        description = ""
+        readme = "README.md"
+
+        [project]
+        name = "mountaineer"
+        version = "0.2.0"
+        description = ""
+
+        [tool.poetry.dependencies]
+        fastapi = "^0.68.0"
+
+        [tool.poetry.dependencies.uvicorn]
+        extras = ["standard",]
+        version = "^0.27.0.post1"
+        """,
+    )

{mountaineer-0.9.0.dev5 → mountaineer-0.9.0.dev6}/.github/scripts/update_version.py

@@ -65,6 +65,10 @@ def update_version_python(new_version: str):
 
     filedata["tool"]["poetry"]["version"] = python_version
 
+    # Also update project.version if it exists
+    if "project" in filedata and "version" in filedata["project"]:
+        filedata["project"]["version"] = python_version
+
     pyproject_path.write_text(toml.dumps(filedata))
 
 

{mountaineer-0.9.0.dev5 → mountaineer-0.9.0.dev6}/Cargo.lock

@@ -535,7 +535,7 @@ dependencies = [
 
 [[package]]
 name = "mountaineer"
-version = "0.9.0-dev5"
+version = "0.9.0-dev6"
 dependencies = [
  "criterion",
  "deno_core_icudata",

{mountaineer-0.9.0.dev5 → mountaineer-0.9.0.dev6}/Cargo.toml

@@ -15,7 +15,7 @@ harness = false
 
 [package]
 name = "mountaineer"
-version = "0.9.0-dev5"
+version = "0.9.0-dev6"
 edition = "2021"
 
 [dependencies]

{mountaineer-0.9.0.dev5 → mountaineer-0.9.0.dev6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: mountaineer
-Version: 0.9.0.dev5
+Version: 0.9.0.dev6
 Requires-Dist: pydantic >=2.5.3, <3.0.0
 Requires-Dist: fastapi >=0.114.1, <1.0.0
 Requires-Dist: inflection >=0.5.1, <1.0.0
@@ -9,9 +9,6 @@ Requires-Dist: uvicorn[standard] >=0.27.0.post1, <1.0.0
 Requires-Dist: packaging >23.2
 Requires-Dist: watchdog >=3.0.0, <4.0.0
 Requires-Dist: pydantic-settings >=2.1.0, <3.0.0
-Requires-Dist: sqlmodel >=0.0.20, <1.0.0
-Requires-Dist: asyncpg >=0.29.0, <1.0.0
-Requires-Dist: sqlalchemy[asyncio] >=2.0.26, <3.0.0
 Requires-Dist: rich >=13.7.1, <14.0.0
 Requires-Dist: websockets <14.0
 License-File: LICENSE
@@ -119,15 +116,15 @@ Below we go through some of the unique aspects of Mountaineer. Let's create a si
 
 For the purposes of this walkthrough we assume your project is generated with `create-mountaineer-app` and you've skipped MVC stub files. If not, you'll have to delete some of the pre-existing files.
 
-Let's get started by creating the data models that will persist app state to the database. These definitions are effectively Pydantic schemas that will be bridged to the database via [SQLModel](https://github.com/tiangolo/sqlmodel).
+Let's get started by creating the data models that will persist app state to the database. These definitions are effectively Pydantic schemas that will be bridged to the database via [iceaxe](https://github.com/piercefreeman/iceaxe). Mountaineer doesn't require any specific database ORM to work, but we have built Iceaxe to have tight integration with Mountaineer.
 
 ```python
 # my_webapp/models/todo.py
 
-from mountaineer.database import SQLModel, Field
+from iceaxe import TableBase, Field
 from uuid import UUID, uuid4
 
-class TodoItem(SQLModel, table=True):
+class TodoItem(TableBase):
     id: UUID = Field(default_factory=uuid4, primary_key=True)
 
     description: str
@@ -156,11 +153,11 @@ Great! At this point we have our database tables created and have a basic server
 # my_webapp/controllers/home.py
 
 from mountaineer import sideeffect, ControllerBase, RenderBase
-from mountaineer.database import DatabaseDependencies
+
+from iceaxe.mountaineer import DatabaseDependencies
+from iceaxe import DBConnection, select
 
 from fastapi import Request, Depends
-from mountaineer.database.session import AsyncSession
-from sqlmodel import select
 
 from my_webapp.models.todo import TodoItem
 
@@ -175,9 +172,9 @@ class HomeController(ControllerBase):
     async def render(
         self,
         request: Request,
-        session: AsyncSession = Depends(DatabaseDependencies.get_db_session)
+        session: DBConnection = Depends(DatabaseDependencies.get_db_connection)
     ) -> HomeRender:
-        todos = (await session.exec(select(TodoItem))).all()
+        todos = await session.exec(select(TodoItem))
 
         return HomeRender(
             client_ip=(
@@ -200,10 +197,9 @@ This `render()` function is a core building block of Mountaineer. All Controller
 > [!TIP]
 > render() functions accepts all parameters that FastAPI endpoints do: paths, query parameters, and dependency injected functions. Right now we're just grabbing the `Request` object to get the client IP.
 
-Note that the database session is provided via dependency injection, which plug-and-plays with [FastAPI's](https://github.com/tiangolo/fastapi) Depends syntax. The standard library provides two main dependency providers:
+Note that the database session is provided via dependency injection, which plug-and-plays with [FastAPI's](https://github.com/tiangolo/fastapi) Depends syntax. The standard library provides one main dependency provider:
 
 - mountaineer.CoreDependencies: helper functions for configurations and general dependency injection
-- mountaineer.database.DatabaseDependencies: helper functions for database lifecycle and management
 
 Now that we've newly created this controller, we wire it up to the application. This registers it for display when you load the homepage.
 

{mountaineer-0.9.0.dev5 → mountaineer-0.9.0.dev6}/README.md

@@ -100,15 +100,15 @@ Below we go through some of the unique aspects of Mountaineer. Let's create a si
 
 For the purposes of this walkthrough we assume your project is generated with `create-mountaineer-app` and you've skipped MVC stub files. If not, you'll have to delete some of the pre-existing files.
 
-Let's get started by creating the data models that will persist app state to the database. These definitions are effectively Pydantic schemas that will be bridged to the database via [SQLModel](https://github.com/tiangolo/sqlmodel).
+Let's get started by creating the data models that will persist app state to the database. These definitions are effectively Pydantic schemas that will be bridged to the database via [iceaxe](https://github.com/piercefreeman/iceaxe). Mountaineer doesn't require any specific database ORM to work, but we have built Iceaxe to have tight integration with Mountaineer.
 
 ```python
 # my_webapp/models/todo.py
 
-from mountaineer.database import SQLModel, Field
+from iceaxe import TableBase, Field
 from uuid import UUID, uuid4
 
-class TodoItem(SQLModel, table=True):
+class TodoItem(TableBase):
     id: UUID = Field(default_factory=uuid4, primary_key=True)
 
     description: str
@@ -137,11 +137,11 @@ Great! At this point we have our database tables created and have a basic server
 # my_webapp/controllers/home.py
 
 from mountaineer import sideeffect, ControllerBase, RenderBase
-from mountaineer.database import DatabaseDependencies
+
+from iceaxe.mountaineer import DatabaseDependencies
+from iceaxe import DBConnection, select
 
 from fastapi import Request, Depends
-from mountaineer.database.session import AsyncSession
-from sqlmodel import select
 
 from my_webapp.models.todo import TodoItem
 
@@ -156,9 +156,9 @@ class HomeController(ControllerBase):
     async def render(
         self,
         request: Request,
-        session: AsyncSession = Depends(DatabaseDependencies.get_db_session)
+        session: DBConnection = Depends(DatabaseDependencies.get_db_connection)
     ) -> HomeRender:
-        todos = (await session.exec(select(TodoItem))).all()
+        todos = await session.exec(select(TodoItem))
 
         return HomeRender(
             client_ip=(
@@ -181,10 +181,9 @@ This `render()` function is a core building block of Mountaineer. All Controller
 > [!TIP]
 > render() functions accepts all parameters that FastAPI endpoints do: paths, query parameters, and dependency injected functions. Right now we're just grabbing the `Request` object to get the client IP.
 
-Note that the database session is provided via dependency injection, which plug-and-plays with [FastAPI's](https://github.com/tiangolo/fastapi) Depends syntax. The standard library provides two main dependency providers:
+Note that the database session is provided via dependency injection, which plug-and-plays with [FastAPI's](https://github.com/tiangolo/fastapi) Depends syntax. The standard library provides one main dependency provider:
 
 - mountaineer.CoreDependencies: helper functions for configurations and general dependency injection
-- mountaineer.database.DatabaseDependencies: helper functions for database lifecycle and management
 
 Now that we've newly created this controller, we wire it up to the application. This registers it for display when you load the homepage.
 

mountaineer-0.9.0.dev6/create_mountaineer_app/create_mountaineer_app/templates/project/[project_name]/cli.py

@@ -0,0 +1,104 @@
+from click import command, option, group
+from mountaineer.cli import handle_runserver, handle_watch, handle_build
+from mountaineer.io import async_to_sync
+from mountaineer.dependencies import get_function_dependencies
+from mountaineer import Depends, CoreDependencies
+
+from iceaxe import DBConnection
+from iceaxe.mountaineer import DatabaseConfig, DatabaseDependencies
+from iceaxe.migrations.cli import handle_apply, handle_generate, handle_rollback
+from iceaxe.schemas.cli import create_all
+
+from {{project_name}} import models
+from {{project_name}}.config import AppConfig
+
+
+@command()
+@option("--port", default=5006, help="Port to run the server on")
+def runserver(port: int):
+    handle_runserver(
+        package="{{project_name}}",
+        webservice="{{project_name}}.main:app",
+        webcontroller="{{project_name}}.app:controller",
+        port=port,
+    )
+
+
+@command()
+def watch():
+    handle_watch(
+        package="{{project_name}}",
+        webcontroller="{{project_name}}.app:controller",
+    )
+
+
+@command()
+def build():
+    handle_build(
+        webcontroller="{{project_name}}.app:controller",
+    )
+
+
+@command()
+@async_to_sync
+async def createdb():
+    _ = AppConfig()  # type: ignore
+
+    async def run_bootstrap(
+        db_connection: DBConnection = Depends(DatabaseDependencies.get_db_connection),
+    ):
+        await create_all(db_connection=db_connection)
+
+    async with get_function_dependencies(callable=run_bootstrap) as values:
+        await run_bootstrap(**values)
+
+
+@group
+def migrate():
+    pass
+
+
+@migrate.command()
+@option("--message", required=False)
+@async_to_sync
+async def generate(message: str | None):
+    async def _inner(
+        config: AppConfig = Depends(CoreDependencies.get_config_with_type(AppConfig)),
+        db_connection: DBConnection = Depends(DatabaseDependencies.get_db_connection),
+    ):
+        assert config.PACKAGE
+        await handle_generate(config.PACKAGE, db_connection, message=message)
+
+    _ = AppConfig()  # type: ignore
+    async with get_function_dependencies(callable=_inner) as deps:
+        await _inner(**deps)
+
+
+@migrate.command()
+@async_to_sync
+async def apply():
+    async def _inner(
+        config: AppConfig = Depends(CoreDependencies.get_config_with_type(AppConfig)),
+        db_connection: DBConnection = Depends(DatabaseDependencies.get_db_connection),
+    ):
+        assert config.PACKAGE
+        await handle_apply(config.PACKAGE, db_connection)
+
+    _ = AppConfig()  # type: ignore
+    async with get_function_dependencies(callable=_inner) as deps:
+        await _inner(**deps)
+
+
+@migrate.command()
+@async_to_sync
+async def rollback():
+    async def _inner(
+        config: AppConfig = Depends(CoreDependencies.get_config_with_type(AppConfig)),
+        db_connection: DBConnection = Depends(DatabaseDependencies.get_db_connection),
+    ):
+        assert config.PACKAGE
+        await handle_rollback(config.PACKAGE, db_connection)
+
+    _ = AppConfig()  # type: ignore
+    async with get_function_dependencies(callable=_inner) as deps:
+        await _inner(**deps)

{mountaineer-0.9.0.dev5 → mountaineer-0.9.0.dev6}/create_mountaineer_app/create_mountaineer_app/templates/project/[project_name]/config.py

@@ -1,5 +1,5 @@
 from mountaineer import ConfigBase
-from mountaineer.database import DatabaseConfig
+from iceaxe.mountaineer import DatabaseConfig
 from pydantic_settings import SettingsConfigDict
 
 class AppConfig(ConfigBase, DatabaseConfig):

{mountaineer-0.9.0.dev5 → mountaineer-0.9.0.dev6}/create_mountaineer_app/create_mountaineer_app/templates/project/[project_name]/controllers/detail.py

@@ -2,8 +2,8 @@
 from uuid import UUID
 
 from mountaineer import Metadata, RenderBase, ControllerBase, APIException, sideeffect
-from mountaineer.database import DatabaseDependencies
-from mountaineer.database.session import AsyncSession
+from mountaineer.mountaineer import DatabaseDependencies
+from mountaineer import DBConnection
 
 from fastapi import Request, Depends
 from fastapi.exceptions import HTTPException
@@ -35,7 +35,7 @@ class DetailController(ControllerBase):
     async def render(
         self,
         detail_id: int,
-        session: AsyncSession = Depends(DatabaseDependencies.get_db_session)
+        session: DBConnection = Depends(DatabaseDependencies.get_db_connection)
     ) -> DetailRender:
         detail_item = await session.get(models.DetailItem, detail_id)
         if not detail_item:
@@ -52,12 +52,12 @@ class DetailController(ControllerBase):
         self,
         detail_id: int,
         payload: UpdateTextRequest,
-        session: AsyncSession = Depends(DatabaseDependencies.get_db_session)
+        session: DBConnection = Depends(DatabaseDependencies.get_db_connection)
     ) -> None:
         detail_item = await session.get(models.DetailItem, detail_id)
         if not detail_item:
             raise NotFoundException()
 
         detail_item.description = payload.description
-        await session.commit()
+        await session.update([detail_item])
 {% endif %}

{mountaineer-0.9.0.dev5 → mountaineer-0.9.0.dev6}/create_mountaineer_app/create_mountaineer_app/templates/project/[project_name]/controllers/home.py

@@ -2,8 +2,8 @@
 from uuid import UUID, uuid4
 
 from mountaineer import sideeffect, ControllerBase, Metadata, RenderBase
-from mountaineer.database import DatabaseDependencies
-from mountaineer.database.session import AsyncSession
+from iceaxe.mountaineer import DatabaseDependencies
+from iceaxe import DBConnection
 
 from fastapi import Request, Depends
 from pydantic import BaseModel
@@ -22,9 +22,9 @@ class HomeController(ControllerBase):
 
     async def render(
         self,
-        session: AsyncSession = Depends(DatabaseDependencies.get_db_session)
+        session: DBConnection = Depends(DatabaseDependencies.get_db_connection)
     ) -> HomeRender:
-        items = (await session.exec(select(models.DetailItem))).all()
+        items = await session.exec(select(models.DetailItem))
         return HomeRender(
             items=items,
             metadata=Metadata(title="Home"),
@@ -33,9 +33,8 @@ class HomeController(ControllerBase):
     @sideeffect
     async def new_detail(
         self,
-        session: AsyncSession = Depends(DatabaseDependencies.get_db_session)
+        session: DBConnection = Depends(DatabaseDependencies.get_db_connection)
     ) -> None:
         obj = models.DetailItem(description="Untitled Item")
-        session.add(obj)
-        await session.commit()
+        await session.insert([obj])
 {% endif %}

{mountaineer-0.9.0.dev5 → mountaineer-0.9.0.dev6}/create_mountaineer_app/create_mountaineer_app/templates/project/[project_name]/models/detail.py

@@ -1,7 +1,7 @@
 {% if create_stub_files %}
-from mountaineer.database import SQLModel, Field
+from iceaxe import TableBase, Field
 
-class DetailItem(SQLModel, table=True):
+class DetailItem(TableBase):
     id: int | None = Field(default=None, primary_key=True)
     description: str
 {% endif %}

{mountaineer-0.9.0.dev5 → mountaineer-0.9.0.dev6}/create_mountaineer_app/create_mountaineer_app/templates/project/pyproject.toml

@@ -42,10 +42,11 @@ readme = "README.md"
 
 dependencies = [
     {% if mountaineer_dev_path %}
-    "mountaineer @ file://{{ mountaineer_dev_path }}"
+    "mountaineer @ file://{{ mountaineer_dev_path }}",
     {% else %}
-    "mountaineer=={{ mountaineer_min_version }}"
+    "mountaineer=={{ mountaineer_min_version }}",
     {% endif %}
+    "iceaxe"
 ]
 
 [build-system]

{mountaineer-0.9.0.dev5 → mountaineer-0.9.0.dev6}/mountaineer/__tests__/fixtures/ci_webapp/ci_webapp/views/app/home/page.tsx

@@ -1,5 +1,5 @@
 import React from "react";
-import { useServer, HTTPValidationErrorException } from "./_server";
+import { useServer, RequestValidationError } from "./_server";
 import { CustomComponent } from "./element";
 
 const Home = () => {
@@ -67,11 +67,11 @@ const Home = () => {
                 },
               });
             } catch (error) {
-              if (error instanceof HTTPValidationErrorException) {
+              if (error instanceof RequestValidationError) {
                 console.log(
                   "Validation Error",
-                  error.body.detail?.[0].loc,
-                  error.body.detail?.[0].msg,
+                  error.body.errors?.[0].location,
+                  error.body.errors?.[0].message,
                 );
               } else {
                 throw error;

{mountaineer-0.9.0.dev5 → mountaineer-0.9.0.dev6}/mountaineer/static/api.ts

@@ -335,7 +335,7 @@ export class ServerURL {
 
     // Split URL into pathname and search parts
     const [pathname, search] = url.split("?");
-    
+
     // Handle base path
     if (base && !pathname.startsWith("/")) {
       const baseDir = base.endsWith("/") ? base : base + "/";
@@ -433,9 +433,7 @@ export class ServerURLSearchParams {
     const pairs: string[] = [];
     for (const [key, values] of this.params) {
       for (const value of values) {
-        pairs.push(
-          `${encodeURIComponent(key)}=${encodeURIComponent(value)}`
-        );
+        pairs.push(`${encodeURIComponent(key)}=${encodeURIComponent(value)}`);
       }
     }
     return pairs.join("&");

{mountaineer-0.9.0.dev5 → mountaineer-0.9.0.dev6}/mountaineer/test_utilities.py

@@ -8,11 +8,7 @@ from time import monotonic_ns
 from typing import Any
 
 import pytest
-from sqlalchemy import text
-from sqlalchemy.exc import DBAPIError
-from sqlalchemy.ext.asyncio import AsyncEngine
 
-from mountaineer.database import SQLModel
 from mountaineer.logging import LOGGER
 
 
@@ -157,39 +153,3 @@ def benchmark_function(
         return wrapper
 
     return wrapper_fn
-
-
-async def bootstrap_database(engine: AsyncEngine):
-    # Test if we can connect to the database, if not throw an early error since
-    # the user likely hasn't booted up the test database
-    try:
-        async with engine.connect() as conn:
-            await conn.execute(text("SELECT 1"))
-    except (DBAPIError, OSError) as e:
-        # Handle specific database connection errors or raise a custom exception
-        raise RuntimeError(
-            "Failed to connect to the test database. Please ensure the database is running and accessible."
-        ) from e
-
-    # We do this at the beginning (instead of auto-cleaning at the end) to make sure
-    # that interrupted runs aren't polluting our database state for a new run, and to
-    # allow us to inspect failed tests after they're run
-    LOGGER.info("Cleaning up test tables")
-    async with engine.begin() as conn:
-        await conn.run_sync(SQLModel.metadata.drop_all)
-
-    async with engine.begin() as conn:
-        await conn.run_sync(SQLModel.metadata.create_all)
-
-        # Log the tables that were created
-        result = await conn.execute(
-            text(
-                """
-            SELECT table_name
-            FROM information_schema.tables
-            WHERE table_schema = 'public'
-        """
-            )
-        )
-        tables = "\n".join([f"* {table[0]}" for table in result.fetchall()])
-        LOGGER.info(f"Created tables:\n{tables}")