mountaineer 0.5.2.dev1__tar.gz → 0.5.2.dev3__tar.gz

{mountaineer-0.5.2.dev1 → mountaineer-0.5.2.dev3}/Cargo.lock

@@ -535,7 +535,7 @@ dependencies = [
 
 [[package]]
 name = "mountaineer"
-version = "0.5.2-dev1"
+version = "0.5.2-dev3"
 dependencies = [
  "criterion",
  "deno_core_icudata",

{mountaineer-0.5.2.dev1 → mountaineer-0.5.2.dev3}/Cargo.toml

@@ -15,7 +15,7 @@ harness = false
 
 [package]
 name = "mountaineer"
-version = "0.5.2-dev1"
+version = "0.5.2-dev3"
 edition = "2021"
 
 [dependencies]

{mountaineer-0.5.2.dev1 → mountaineer-0.5.2.dev3}/Makefile

@@ -83,11 +83,11 @@ lint-validation-scripts:
 
 # Tests
 test-lib:
-	(cd $(LIB_DIR) && docker-compose -f docker-compose.test.yml up -d)
+	(cd $(LIB_DIR) && docker compose -f docker-compose.test.yml up -d)
 	@$(call wait-for-postgres,30,5438)
 	@set -e; \
 	$(call test-common,$(LIB_DIR),$(LIB_NAME))
-	(cd $(LIB_DIR) && docker-compose -f docker-compose.test.yml down)
+	(cd $(LIB_DIR) && docker compose -f docker-compose.test.yml down)
 	$(call test-rust-common,$(LIB_DIR),$(LIB_NAME))
 test-lib-integrations:
 	$(call test-common-integrations,$(LIB_DIR),$(LIB_NAME))

{mountaineer-0.5.2.dev1 → mountaineer-0.5.2.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: mountaineer
-Version: 0.5.2.dev1
+Version: 0.5.2.dev3
 Requires-Dist: pydantic
 Requires-Dist: fastapi
 Requires-Dist: inflection
@@ -80,10 +80,10 @@ Every service file is nested under the `my_webapp` root package. Views are defin
 
 ### Development
 
-If you're starting a new application from scratch, you'll typically want to create your new database tables. Make sure you have postgres running. We bundle a docker-compose file for convenience with `create-mountaineer-app`.
+If you're starting a new application from scratch, you'll typically want to create your new database tables. Make sure you have postgres running. We bundle a docker compose file for convenience with `create-mountaineer-app`.
 
 ```bash
-docker-compose up -d
+docker compose up -d
 poetry run createdb
 ```
 
@@ -141,10 +141,10 @@ Update the index file as well:
 from .todo import TodoItem # noqa: F401
 ```
 
-Make sure you have a Postgres database running. We bundle a docker-compose file for convenience with `create-mountaineer-app`. Launch it in the background and create the new database tables from these code definitions:
+Make sure you have a Postgres database running. We bundle a docker compose file for convenience with `create-mountaineer-app`. Launch it in the background and create the new database tables from these code definitions:
 
 ```bash
-docker-compose up -d
+docker compose up -d
 poetry run createdb
 poetry run runserver
 ```
@@ -158,7 +158,7 @@ from mountaineer import sideeffect, ControllerBase, RenderBase
 from mountaineer.database import DatabaseDependencies
 
 from fastapi import Request, Depends
-from sqlalchemy.ext.asyncio import AsyncSession
+from mountaineer.database.session import AsyncSession
 from sqlmodel import select
 
 from my_webapp.models.todo import TodoItem
@@ -176,7 +176,7 @@ class HomeController(ControllerBase):
         request: Request,
         session: AsyncSession = Depends(DatabaseDependencies.get_db_session)
     ) -> HomeRender:
-        todos = await session.execute(select(TodoItem))
+        todos = (await session.exec(select(TodoItem))).all()
 
         return HomeRender(
             client_ip=(
@@ -184,7 +184,7 @@ class HomeController(ControllerBase):
                 if request.client
                 else "unknown"
             ),
-            todos=todos.scalars().all()
+            todos=todos
         )
 ```
 

{mountaineer-0.5.2.dev1 → mountaineer-0.5.2.dev3}/README.md

@@ -62,10 +62,10 @@ Every service file is nested under the `my_webapp` root package. Views are defin
 
 ### Development
 
-If you're starting a new application from scratch, you'll typically want to create your new database tables. Make sure you have postgres running. We bundle a docker-compose file for convenience with `create-mountaineer-app`.
+If you're starting a new application from scratch, you'll typically want to create your new database tables. Make sure you have postgres running. We bundle a docker compose file for convenience with `create-mountaineer-app`.
 
 ```bash
-docker-compose up -d
+docker compose up -d
 poetry run createdb
 ```
 
@@ -123,10 +123,10 @@ Update the index file as well:
 from .todo import TodoItem # noqa: F401
 ```
 
-Make sure you have a Postgres database running. We bundle a docker-compose file for convenience with `create-mountaineer-app`. Launch it in the background and create the new database tables from these code definitions:
+Make sure you have a Postgres database running. We bundle a docker compose file for convenience with `create-mountaineer-app`. Launch it in the background and create the new database tables from these code definitions:
 
 ```bash
-docker-compose up -d
+docker compose up -d
 poetry run createdb
 poetry run runserver
 ```
@@ -140,7 +140,7 @@ from mountaineer import sideeffect, ControllerBase, RenderBase
 from mountaineer.database import DatabaseDependencies
 
 from fastapi import Request, Depends
-from sqlalchemy.ext.asyncio import AsyncSession
+from mountaineer.database.session import AsyncSession
 from sqlmodel import select
 
 from my_webapp.models.todo import TodoItem
@@ -158,7 +158,7 @@ class HomeController(ControllerBase):
         request: Request,
         session: AsyncSession = Depends(DatabaseDependencies.get_db_session)
     ) -> HomeRender:
-        todos = await session.execute(select(TodoItem))
+        todos = (await session.exec(select(TodoItem))).all()
 
         return HomeRender(
             client_ip=(
@@ -166,7 +166,7 @@ class HomeController(ControllerBase):
                 if request.client
                 else "unknown"
             ),
-            todos=todos.scalars().all()
+            todos=todos
         )
 ```
 

{mountaineer-0.5.2.dev1 → mountaineer-0.5.2.dev3}/create_mountaineer_app/create_mountaineer_app/__tests__/test_builder.py

@@ -129,7 +129,7 @@ def test_valid_permutations(
         "COMPOSE_PROJECT_NAME": f"test_project-{uuid4()}",
     }
     subprocess.run(
-        ["docker-compose", "up", "-d"],
+        ["docker", "compose", "up", "-d"],
         cwd=metadata.project_path,
         check=True,
         env=docker_compose_env,
@@ -202,7 +202,7 @@ def test_valid_permutations(
 
         secho("Shutting down docker...")
         subprocess.run(
-            ["docker-compose", "down"],
+            ["docker", "compose", "down"],
             cwd=metadata.project_path,
             check=True,
             env=docker_compose_env,

{mountaineer-0.5.2.dev1 → mountaineer-0.5.2.dev3}/create_mountaineer_app/create_mountaineer_app/templates/project/[project_name]/controllers/detail.py

@@ -5,7 +5,7 @@ from mountaineer import Metadata, RenderBase, ControllerBase, APIException, side
 from mountaineer.database import DatabaseDependencies
 
 from fastapi import Request, Depends
-from sqlalchemy.ext.asyncio import AsyncSession
+from mountaineer.database.session import AsyncSession
 from fastapi.exceptions import HTTPException
 from pydantic import BaseModel
 
@@ -60,4 +60,4 @@ class DetailController(ControllerBase):
 
         detail_item.description = payload.description
         await session.commit()
-{% endif %}
+{% endif %}

{mountaineer-0.5.2.dev1 → mountaineer-0.5.2.dev3}/create_mountaineer_app/create_mountaineer_app/templates/project/[project_name]/controllers/home.py

@@ -7,7 +7,7 @@ from mountaineer.database import DatabaseDependencies
 from fastapi import Request, Depends
 from pydantic import BaseModel
 from sqlmodel import select
-from sqlalchemy.ext.asyncio import AsyncSession
+from mountaineer.database.session import AsyncSession
 
 from {{project_name}} import models
 
@@ -24,9 +24,9 @@ class HomeController(ControllerBase):
         self,
         session: AsyncSession = Depends(DatabaseDependencies.get_db_session)
     ) -> HomeRender:
-        items = await session.execute(select(models.DetailItem))
+        items = (await session.exec(select(models.DetailItem))).all()
         return HomeRender(
-            items=items.scalars().all(),
+            items=items,
             metadata=Metadata(title="Home"),
         )
 
@@ -38,4 +38,4 @@ class HomeController(ControllerBase):
         obj = models.DetailItem(description="Untitled Item")
         session.add(obj)
         await session.commit()
-{% endif %}
+{% endif %}

{mountaineer-0.5.2.dev1 → mountaineer-0.5.2.dev3}/docs_website/docs/database_migrations.md

@@ -143,7 +143,7 @@ async def up(
     self,
     migrator: Migrator = Depends(MigrationDependencies.get_migrator),
 ):
-    result = await migrator.db_session.execute("SELECT * FROM article")
+    result = await migrator.db_session.exec("SELECT * FROM article")
 ```
 
 We recommend using the actor object whenever possible, as it provides a more consistent and safe way to run migrations. If you are using the raw database session object, be aware that we require migrations to be run in a single transaction. This ensures that if a migration fails, the database will be rolled back to its previous state. We therefore disable calling `db_session.commit()` explicitly from within user code.

{mountaineer-0.5.2.dev1 → mountaineer-0.5.2.dev3}/docs_website/docs/quickstart.md

@@ -21,10 +21,10 @@ Mountaineer projects all follow a similar structure. For more on this, see our d
 
 ### Development
 
-If you're starting a new application from scratch, you'll typically want to create your new database tables. Make sure you have postgres running. We bundle a docker-compose file for convenience with `create-mountaineer-app`.
+If you're starting a new application from scratch, you'll typically want to create your new database tables. Make sure you have postgres running. We bundle a docker compose file for convenience with `create-mountaineer-app`.
 
 ```bash
-docker-compose up -d
+docker compose up -d
 poetry run createdb
 ```
 
@@ -78,10 +78,10 @@ Update the index file as well:
 from .todo import TodoItem # noqa: F401
 ```
 
-Make sure you have a Postgres database running. We bundle a docker-compose file for convenience with `create-mountaineer-app`. Launch it in the background and create the new database tables from these code definitions:
+Make sure you have a Postgres database running. We bundle a docker compose file for convenience with `create-mountaineer-app`. Launch it in the background and create the new database tables from these code definitions:
 
 ```bash
-docker-compose up -d
+docker compose up -d
 poetry run createdb
 poetry run runserver
 ```
@@ -111,7 +111,7 @@ class HomeController(ControllerBase):
         request: Request,
         session: AsyncSession = Depends(DatabaseDependencies.get_db_session)
     ) -> HomeRender:
-        todos = await session.execute(select(TodoItem))
+        todos = (await session.exec(select(TodoItem))).all()
 
         return HomeRender(
             client_ip=(
@@ -119,7 +119,7 @@ class HomeController(ControllerBase):
                 if request.client
                 else "unknown"
             ),
-            todos=todos.scalars().all()
+            todos=todos
         )
 ```
 

{mountaineer-0.5.2.dev1 → mountaineer-0.5.2.dev3}/docs_website/docs/structure.md

@@ -6,7 +6,7 @@ For a project called `my_webapp`, you should have something like the following:
 ```
 my_webapp/
 ├── README.md
-├── docker-compose.yml
+├── docker compose.yml
 ├── my_webapp
 │   ├── __init__.py
 │   ├── app.py

{mountaineer-0.5.2.dev1 → mountaineer-0.5.2.dev3}/docs_website/docs/views.md

@@ -51,7 +51,7 @@ A controller backs a view in a 1:1 relationship. It provides the backend plumbin
 from mountaineer import sideeffect, ControllerBase, RenderBase
 from mountaineer.database import DatabaseDependencies
 
-from sqlalchemy.ext.asyncio import AsyncSession
+from mountaineer.database.session import AsyncSession
 from sqlmodel import select
 
 from myapp.models import TodoItem
@@ -67,10 +67,10 @@ class HomeController(ControllerBase):
         self,
         session: AsyncSession = Depends(DatabaseDependencies.get_db_session)
     ) -> HomeRender:
-        todos = await session.execute(select(TodoItem))
+        todos = (await session.execute(select(TodoItem))).all()
 
         return HomeRender(
-            todos=todos.scalars().all()
+            todos=todos
         )
 ```
 

{mountaineer-0.5.2.dev1 → mountaineer-0.5.2.dev3}/mountaineer/__tests__/actions/test_passthrough_dec.py

@@ -54,40 +54,39 @@ class ExamplePassthroughModel(BaseModel):
     status: str
 
 
-@pytest.mark.asyncio
-async def test_can_call_passthrough():
-    class TestController(ControllerBase):
-        url: str = "/test/{query_id}/"
-
-        def __init__(self):
-            super().__init__()
-            self.counter = 0
-            self.render_counts = 0
+class ExampleController(ControllerBase):
+    url: str = "/test/{query_id}/"
+
+    def __init__(self):
+        super().__init__()
+        self.counter = 0
+        self.render_counts = 0
+
+    def render(
+        self,
+        query_id: int,
+    ) -> ExampleRenderModel:
+        self.render_counts += 1
+        return ExampleRenderModel(
+            value_a="Hello",
+            value_b="World",
+        )
 
-        def render(
-            self,
-            query_id: int,
-        ) -> ExampleRenderModel:
-            self.render_counts += 1
-            return ExampleRenderModel(
-                value_a="Hello",
-                value_b="World",
-            )
+    @passthrough
+    def call_passthrough(self, payload: dict) -> ExamplePassthroughModel:
+        self.counter += 1
+        return ExamplePassthroughModel(status="success")
 
-        @passthrough
-        def call_passthrough(self, payload: dict) -> ExamplePassthroughModel:
-            self.counter += 1
-            return ExamplePassthroughModel(status="success")
+    @passthrough
+    async def call_passthrough_async(self, payload: dict) -> ExamplePassthroughModel:
+        self.counter += 1
+        return ExamplePassthroughModel(status="success")
 
-        @passthrough
-        async def call_passthrough_async(
-            self, payload: dict
-        ) -> ExamplePassthroughModel:
-            self.counter += 1
-            return ExamplePassthroughModel(status="success")
 
+@pytest.mark.asyncio
+async def test_can_call_passthrough():
     app = AppController(view_root=Path())
-    controller = TestController()
+    controller = ExampleController()
     app.register(controller)
 
     return_value_sync = await controller.call_passthrough(
@@ -114,6 +113,22 @@ async def test_can_call_passthrough():
     assert controller.render_counts == 0
 
 
+@pytest.mark.asyncio
+async def test_can_call_passthrough_original():
+    """
+    Ensure that we can access the raw underlying function that was
+    wrapped by the decorator.
+
+    """
+    controller = ExampleController()
+    assert await ExampleController.call_passthrough.original(
+        controller, dict()
+    ) == ExamplePassthroughModel(status="success")
+    assert await ExampleController.call_passthrough_async.original(
+        controller, dict()
+    ) == ExamplePassthroughModel(status="success")
+
+
 class ExampleModel(BaseModel):
     value: str
 

{mountaineer-0.5.2.dev1 → mountaineer-0.5.2.dev3}/mountaineer/__tests__/actions/test_sideeffect_dec.py

@@ -90,12 +90,12 @@ async def call_sideeffect_common(controller: ControllerCommon):
 
         # Even if the "request" is not required by our sideeffects, it's required
         # by the function injected by the sideeffect decorator.
-        return_value_sync = await controller.call_sideeffect(
+        return_value_sync = await controller.call_sideeffect(  # type: ignore
             {},
             request=Request({"type": "http"}),  # type: ignore
         )
 
-        return_value_async = await controller.call_sideeffect_async(
+        return_value_async = await controller.call_sideeffect_async(  # type: ignore
             {},
             request=Request({"type": "http"}),  # type: ignore
         )
@@ -157,6 +157,30 @@ async def test_can_call_sideeffect_async_render():
     await call_sideeffect_common(ExampleController())
 
 
+@pytest.mark.asyncio
+async def test_can_call_sideeffect_original():
+    """
+    Ensure that we can access the raw underlying function that was
+    wrapped by the decorator.
+
+    """
+
+    class ExampleController(ControllerCommon):
+        def render(
+            self,
+            query_id: int,
+        ) -> ExampleRenderModel:
+            self.render_counts += 1
+            return ExampleRenderModel(
+                value_a="Hello",
+                value_b="World",
+            )
+
+    controller = ExampleController()
+    await ExampleController.call_sideeffect.original(controller, dict())
+    await ExampleController.call_sideeffect_async.original(controller, dict())
+
+
 @pytest.mark.asyncio
 @pytest.mark.parametrize(
     "referer, expected_resolved",

{mountaineer-0.5.2.dev1 → mountaineer-0.5.2.dev3}/mountaineer/__tests__/migrations/conftest.py

@@ -6,12 +6,13 @@ import pytest
 import pytest_asyncio
 from fastapi import Depends
 from sqlalchemy import exc as sa_exc
-from sqlalchemy.ext.asyncio import AsyncEngine, AsyncSession, async_sessionmaker
+from sqlalchemy.ext.asyncio import AsyncEngine, async_sessionmaker
 from sqlmodel import SQLModel, text
 
 from mountaineer.config import ConfigBase, unregister_config
 from mountaineer.database import DatabaseDependencies
 from mountaineer.database.config import DatabaseConfig
+from mountaineer.database.session import AsyncSession
 from mountaineer.dependencies.base import get_function_dependencies
 from mountaineer.test_utilities import bootstrap_database
 
@@ -44,7 +45,7 @@ async def clear_all_database_objects(db_session: AsyncSession):
 
     """
     # Step 1: Drop all tables in the public schema
-    await db_session.execute(
+    await db_session.exec(
         text(
             """
         DO $$ DECLARE
@@ -59,7 +60,7 @@ async def clear_all_database_objects(db_session: AsyncSession):
     )
 
     # Step 2: Drop all custom types in the public schema
-    await db_session.execute(
+    await db_session.exec(
         text(
             """
         DO $$ DECLARE
@@ -130,6 +131,8 @@ async def db_engine(config: MigrationAppConfig):
 
 @pytest_asyncio.fixture
 async def db_session(db_engine: AsyncEngine):
-    session_maker = async_sessionmaker(db_engine, expire_on_commit=False)
+    session_maker = async_sessionmaker(
+        db_engine, class_=AsyncSession, expire_on_commit=False
+    )
     async with session_maker() as session:
         yield session